[Git][security-tracker-team/security-tracker][master] Point to debian-security-support master branch:

[Sylvain Beucler (@beuc)]

Sylvain Beucler pushed to branch master at Debian Security Tracker / security-tracker


Commits:
785fb38a by Sylvain Beucler at 2024-08-08T20:07:28+02:00
Point to debian-security-support master branch:
- security-support-limited is now split by version security-support-limited.debXX in master branch
  https://salsa.debian.org/debian/debian-security-support/-/commit/58b041174ef1755a775d60b9ac6469dceae521fa
- d-s-s changes are usually made in master branch first, and later replicated to dist-specific branches, so master is usually more fresh
- d-s-s/bullseye doesn't have support for package regex introduced in bookworm
  https://salsa.debian.org/debian/debian-security-support/-/commit/bf9dc3b6b76f6aa5bee6591a20428744a214cb69

This partially reverts 20f0b653ee78c80c5faa849b2c3f0fcc50479fa4 which targetted non-split security-support-limited.

- - - - -


1 changed file:

- bin/unsupported_packages.py


Changes:

=====================================
bin/unsupported_packages.py
=====================================
@@ -49,7 +49,7 @@ class DebSecSupport(set):
 
 
 class UnsupportedPackages(DebSecSupport):
-    URL = "https://salsa.debian.org/debian/debian-security-support/raw/{}/security-support-ended.deb{}"
+    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-ended.deb{}"
     CACHED_DATA_PATH = "~/.cache/security-support-ended.deb{}"
 
     def __init__(self, codename, update_cache=True):
@@ -57,7 +57,7 @@ class UnsupportedPackages(DebSecSupport):
         dists = list(config.get_config().keys())
         self.debian_version = dists.index(codename) + 1
 
-        self.url = self.URL.format(codename, self.debian_version)
+        self.url = self.URL.format(self.debian_version)
 
         self.cache = os.path.expanduser(self.CACHED_DATA_PATH).format(
             self.debian_version,
@@ -67,10 +67,18 @@ class UnsupportedPackages(DebSecSupport):
 
 
 class LimitedSupportPackages(DebSecSupport):
-    URL = "https://salsa.debian.org/debian/debian-security-support/raw/{}/security-support-limited"
-    CACHED_DATA_PATH = "~/.cache/security-support-limited"
+    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-limited.deb{}"
+    CACHED_DATA_PATH = "~/.cache/security-support-limited.deb{}"
 
     def __init__(self, codename, update_cache=True):
-        self.url = self.URL.format(codename)
-        self.cache = os.path.expanduser(self.CACHED_DATA_PATH)
+        # codename to version number
+        dists = list(config.get_config().keys())
+        self.debian_version = dists.index(codename) + 1
+
+        self.url = self.URL.format(self.debian_version)
+
+        self.cache = os.path.expanduser(self.CACHED_DATA_PATH).format(
+            self.debian_version,
+        )
+
         super(LimitedSupportPackages, self).__init__(update_cache)



View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/785fb38a6165369d20bcd4897bcb10dd33e574c5

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/785fb38a6165369d20bcd4897bcb10dd33e574c5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-security-tracker-commits/attachments/20240808/4c9fb6ef/attachment-0001.htm>