Salvatore Bonaccorso pushed to branch master at Debian Security Tracker / security-tracker
Commits: cc99c2fc by Salvatore Bonaccorso at 2023-02-04T11:26:51+01:00 lib/debian-releases.mk: Add support for fetching from different archive areas For suites older than bookworm, fix section to main, contrib and non-free. Starting in bookworm an additonal archive section non-free-firmware will be present. Link: https://bugs.debian.org/1030321 Signed-off-by: Salvatore Bonaccorso <car...@debian.org> - - - - - f38abb2f by Salvatore Bonaccorso at 2023-02-04T11:26:51+01:00 Makefile: Do not hardcode archive areas to fetch from Use the list of archive areas depending on the Debian release affected. Link: https://bugs.debian.org/1030321 Signed-off-by: Salvatore Bonaccorso <car...@debian.org> - - - - - f63ca333 by Salvatore Bonaccorso at 2023-02-04T11:26:51+01:00 grab-cve-in-fix: Adjust comment to mention non-free-firmware Sources Signed-off-by: Salvatore Bonaccorso <car...@debian.org> - - - - - 27e0a6e7 by Salvatore Bonaccorso at 2023-02-04T10:50:31+00:00 Merge branch 'non-free-firmware-support' into 'master' Add support for non-free-firmware archive component See merge request security-tracker-team/security-tracker!124 - - - - - 3 changed files: - Makefile - bin/grab-cve-in-fix - lib/debian-releases.mk Changes: ===================================== Makefile ===================================== @@ -48,7 +48,8 @@ update-$(1): prefix="$$($(1)_RELEASE)_$$($(1)_SUBRELEASE)"; \ dist="$$($(1)_DIST)"; \ mirror="$$($(1)_MIRROR)"; \ - for section in main contrib non-free ; do \ + sections="$$($(1)_SECTIONS)"; \ + for section in main $$$$sections ; do \ bin/apt-update-file \ $$$$mirror/dists/$$$$dist/$$$$section/source/Sources \ data/packages/$$$${prefix}_$$$${section}_Sources ; \ ===================================== bin/grab-cve-in-fix ===================================== @@ -355,6 +355,7 @@ def main(): data/packages/sid__main_Sources data/packages/sid__contrib_Sources data/packages/sid__non-free_Sources + data/packages/sid__non-free-firmware_Sources """ parser = argparse.ArgumentParser( description="Grab CVE data from a package upload for manual review", ===================================== lib/debian-releases.mk ===================================== @@ -15,6 +15,11 @@ $(1)_MIRROR = $$(MIRROR) $(1)_DIST = $(1) $(1)_ARCHS = $(call get_config, '.distributions.$(1).architectures[]') $(1)_RELEASE = $(1) +ifneq (,$(filter jessie stretch buster bullseye,$(1))) +$(1)_SECTIONS = main contrib non-free +else +$(1)_SECTIONS = main contrib non-free non-free-firmware +endif $(1)_SUBRELEASE = RELEASES += $(1) endef @@ -34,6 +39,7 @@ $(1)_security_DIST = $(1)-security endif $(1)_security_ARCHS = $$($(1)_ARCHS) $(1)_security_RELEASE = $(1) +$(1)_security_SECTIONS = $$($(1)_SECTIONS) $(1)_security_SUBRELEASE = security RELEASES += $(1)_security endef @@ -45,6 +51,7 @@ $(1)_backports_MIRROR = $$(MIRROR) $(1)_backports_DIST = $(1)-backports $(1)_backports_ARCHS = $$($(1)_ARCHS) $(1)_backports_RELEASE = $(1)-backports +$(1)_backports_SECTIONS = $$($(1)_SECTIONS) $(1)_backports_SUBRELEASE = RELEASES += $(1)_backports endef View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/e310961624138610c9a7a3fc1aedf9bfcb99656d...27e0a6e7dc9f2eda69e9aa2ebc020f4ecd4e3a2c -- View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/e310961624138610c9a7a3fc1aedf9bfcb99656d...27e0a6e7dc9f2eda69e9aa2ebc020f4ecd4e3a2c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-security-tracker-commits mailing list debian-security-tracker-commits@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-security-tracker-commits
