[Git][security-tracker-team/security-tracker][jspricke/fix_d_s_s] unsupported_packages: support new merged lists

[Jochen Sprickerhof (@jspricke)]

Jochen Sprickerhof pushed to branch jspricke/fix_d_s_s at Debian Security Tracker / security-tracker


Commits:
ef602682 by Jochen Sprickerhof at 2025-04-15T15:41:39+02:00
unsupported_packages: support new merged lists

Needed due to #1053462.

- - - - -


1 changed file:

- bin/unsupported_packages.py


Changes:

=====================================
bin/unsupported_packages.py
=====================================
@@ -20,11 +20,13 @@ import os
 import re
 import requests
 
-re_line = re.compile(r'(?!#)(?P<pkg>[^\s]+)')
+re_line_limited = re.compile(r'(?!#)(?P<pkg>[^\s]+)\s*limited')
+re_line_unsupported = re.compile(r'(?!#)(?P<pkg>[^\s]+)\s*non-supported')
 
 
 class DebSecSupport(set):
-    def __init__(self, update_cache):
+    def __init__(self, update_cache, re_line):
+        self.re_line = re_line
         if update_cache:
             self.update_cache()
 
@@ -42,15 +44,15 @@ class DebSecSupport(set):
     def load(self):
         with open(self.cache, 'r') as f:
             for x in f.readlines():
-                m = re_line.match(x)
+                m = self.re_line.match(x)
 
                 if m is not None:
                     self.add(m.group('pkg'))
 
 
 class UnsupportedPackages(DebSecSupport):
-    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-ended.deb{}"
-    CACHED_DATA_PATH = "~/.cache/security-support-ended.deb{}"
+    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support.deb{}"
+    CACHED_DATA_PATH = "~/.cache/security-support.deb{}"
 
     def __init__(self, codename, update_cache=True):
         # codename to version number
@@ -63,12 +65,12 @@ class UnsupportedPackages(DebSecSupport):
             self.debian_version,
         )
 
-        super(UnsupportedPackages, self).__init__(update_cache)
+        super(UnsupportedPackages, self).__init__(update_cache, re_line_unsupported)
 
 
 class LimitedSupportPackages(DebSecSupport):
-    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-limited.deb{}"
-    CACHED_DATA_PATH = "~/.cache/security-support-limited.deb{}"
+    URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support.deb{}"
+    CACHED_DATA_PATH = "~/.cache/security-support.deb{}"
 
     def __init__(self, codename, update_cache=True):
         # codename to version number
@@ -81,4 +83,4 @@ class LimitedSupportPackages(DebSecSupport):
             self.debian_version,
         )
 
-        super(LimitedSupportPackages, self).__init__(update_cache)
+        super(LimitedSupportPackages, self).__init__(update_cache, re_line_limited)



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

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/commit/ef602682a5b6801ef88d9c2d1211efa9d7ceeed0
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/20250415/7bfc5162/attachment-0001.htm>