Hi On Sat, May 27, 2017 at 11:04:14AM +0200, Salvatore Bonaccorso wrote: > Hi > > Just a heads-up and cc'ing the two relevant teams as well explicitly. > > In the light of the planned release date for strech on 2017-06-17, > https://lists.debian.org/debian-devel-announce/2017/05/msg00002.html I > plan to work on the relvant changes to the security tracker for once > stretch is released.
I'm attaching the *preliminary* set of changes which I plan to activate once stretch is released. Regards, Salvatore
>From 9a55f239099d2900b5304a0290383776b2de7d7a Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 09:54:22 +0200 Subject: [PATCH 01/19] gen-{DSA,DLA}: Update mappings release and codenames --- bin/gen-DSA | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/gen-DSA b/bin/gen-DSA index 5b033a56f1..8503aaa65f 100755 --- a/bin/gen-DSA +++ b/bin/gen-DSA @@ -27,10 +27,10 @@ case "$(basename "$0")" in ;; esac -OLDOLDSTABLE=squeeze -OLDSTABLE=wheezy -STABLE=jessie -TESTING=stretch +OLDOLDSTABLE=wheezy +OLDSTABLE=jessie +STABLE=stretch +TESTING=buster NAME_SPACING=24 DATE_SPACING=22 -- 2.11.0
>From 807e6d844afd1e5b137ce9c989886ad34a711af3 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 10:02:08 +0200 Subject: [PATCH 02/19] DSA.template: Switch back to defaul text for testing distribution --- doc/DSA.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DSA.template b/doc/DSA.template index ce83e04e4d..5567fb16e9 100644 --- a/doc/DSA.template +++ b/doc/DSA.template @@ -17,8 +17,8 @@ $TEXT For the stable distribution ($STABLE), this problem has been fixed in version $$STABLE_VERSION. -For the upcoming stable distribution ($TESTING), this problem has been -fixed in version $$TESTING_VERSION. +For the testing distribution ($TESTING), this problem has been fixed +in version $$TESTING_VERSION. For the unstable distribution (sid), this problem has been fixed in version $UNSTABLE_VERSION. -- 2.11.0
>From 6a0f6bdef1fbe9944b95bc0c90b5df54eb0463da Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 10:02:28 +0200 Subject: [PATCH 03/19] DSA.template: Add support for oldstable version information in DSA --- doc/DSA.template | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/DSA.template b/doc/DSA.template index 5567fb16e9..9f0a989fdd 100644 --- a/doc/DSA.template +++ b/doc/DSA.template @@ -14,6 +14,9 @@ Debian Bug : $BUGNUM $TEXT +For the oldstable distribution ($OLDSTABLE), this problem has been fixed +in version $$OLDSTABLE_VERSION. + For the stable distribution ($STABLE), this problem has been fixed in version $$STABLE_VERSION. -- 2.11.0
>From 83218f631beede31df4f4b1d05c367b2077253ed Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 10:25:08 +0200 Subject: [PATCH 04/19] List packages from oldstable stable for dsa-needed list --- bin/add-dsa-needed.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/add-dsa-needed.sh b/bin/add-dsa-needed.sh index e500246c8d..ac21decffa 100755 --- a/bin/add-dsa-needed.sh +++ b/bin/add-dsa-needed.sh @@ -52,8 +52,8 @@ case "${1:-}" in ;; esac -#for release in oldstable stable; do -for release in stable; do +# for release in stable; do +for release in oldstable stable; do HOME=$tmpd w3m $turl/$release > $tmpd/$release.txt touch $tmpd/toadd-$release.txt seen_marker=false @@ -82,18 +82,18 @@ for release in stable; do done < $tmpd/$release.txt done -#cat $tmpd/toadd-stable.txt $tmpd/toadd-oldstable.txt | sort | uniq -d | -cat $tmpd/toadd-stable.txt | sort | uniq -d | +#cat $tmpd/toadd-stable.txt | sort | uniq -d | +cat $tmpd/toadd-stable.txt $tmpd/toadd-oldstable.txt | sort | uniq -d | while read pkg; do printf "%s\n--\n" "$pkg" >> $output sed -ri "/^$pkg\$/d" $tmpd/toadd-stable.txt - #sed -ri "/^$pkg\$/d" $tmpd/toadd-oldstable.txt + sed -ri "/^$pkg\$/d" $tmpd/toadd-oldstable.txt done # Skip oldoldstable for now as it is an LTS release, tracked with # dla-needed: -#for release in oldstable stable; do -for release in stable; do +#for release in stable; do +for release in oldstable stable; do while read pkg; do printf "%s/%s\n--\n" "$pkg" "$release" >> $output done < $tmpd/toadd-$release.txt -- 2.11.0
>From c55737250e1c0f8e010390323b16bcd138ec5f71 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 10:34:47 +0200 Subject: [PATCH 05/19] support-ended.py: Update mapping release -> codenames --- bin/tracker_data.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/tracker_data.py b/bin/tracker_data.py index 9f61d66abf..3bbac16603 100644 --- a/bin/tracker_data.py +++ b/bin/tracker_data.py @@ -22,10 +22,10 @@ import requests import six RELEASES = { - 'oldoldstable': 'squeeze', - 'oldstable': 'wheezy', - 'stable': 'jessie', - 'testing': 'stretch', + 'oldoldstable': 'wheezy', + 'oldstable': 'jessie', + 'stable': 'stretch', + 'testing': 'buster', 'unstable': 'sid', 'experimental': 'experimental', # LTS specific aliases -- 2.11.0
>From 5d0fbf2a5c6ee6d5f897dfb4cc061000e90703c3 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 11:00:05 +0200 Subject: [PATCH 06/19] tracker-service: Update release -> codename mappings for stretch release --- bin/tracker_service.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/tracker_service.py b/bin/tracker_service.py index 494723427b..fdb755dc67 100644 --- a/bin/tracker_service.py +++ b/bin/tracker_service.py @@ -855,19 +855,19 @@ to improve our documentation and procedures, so feedback is welcome.""")])]) return self.page_status_release_unstable_like( path, params, url, title='Vulnerable source packages among backports for stable', - rel='jessie-backports') + rel='stretch-backports') def page_status_release_oldstable_backports(self, path, params, url): return self.page_status_release_unstable_like( path, params, url, title='Vulnerable source packages among backports for oldstable', - rel='wheezy-backports') + rel='jessie-backports') def page_status_release_oldoldstable_backports(self, path, params, url): return self.page_status_release_unstable_like( path, params, url, title='Vulnerable source packages among backports for oldoldstable', - rel='squeeze-backports') + rel='wheezy-backports') def page_status_dtsa_candidates(self, path, params, url): @@ -882,11 +882,11 @@ to improve our documentation and procedures, so feedback is welcome.""")])]) (SELECT testing.version_id < stable.version_id FROM source_packages AS testing, source_packages AS stable WHERE testing.name = testing_status.package - AND testing.release = 'stretch' + AND testing.release = 'buster' AND testing.subrelease = '' AND testing.archive = testing_status.section AND stable.name = testing_status.package - AND stable.release = 'jessie' + AND stable.release = 'stretch' AND stable.subrelease = 'security' AND stable.archive = testing_status.section), (SELECT range_remote FROM nvd_data @@ -966,7 +966,7 @@ checker to find out why they have not entered testing yet."""), old_pkg = '' old_dsc = '' last_displayed = '' - releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze') + releases = ('sid', 'buster', 'stretch', 'jessie', 'wheezy') for (pkg_name, bug_name, release, desc) in self.db.cursor().execute( """SELECT DISTINCT sp.name, st.bug_name, sp.release, bugs.description @@ -1011,7 +1011,7 @@ checker to find out why they have not entered testing yet."""), old_dsc = '' old_name = '' last_displayed = '' - releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze') + releases = ('sid', 'buster', 'stretch', 'jessie', 'wheezy') for (pkg_name, bug_name, release, desc) in self.db.cursor().execute( """SELECT DISTINCT sp.name, st.bug_name, sp.release, bugs.description @@ -1296,7 +1296,7 @@ Debian bug number.'''), status = defaultdict(lambda: defaultdict(dict)) urgency = defaultdict(lambda: defaultdict(dict)) nodsa = defaultdict(lambda: defaultdict(dict)) - supported_releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze') + supported_releases = ('sid', 'buster', 'stretch', 'jessie', 'wheezy') for (pkg, issue, desc, debianbug, release, subrelease, db_version, db_fixed_version, db_status, db_urgency, db_remote, db_nodsa) in self.db.cursor().execute( """SELECT sp.name, st.bug_name, (SELECT cve_desc FROM nvd_data -- 2.11.0
>From 0b2099be33af65be24f826913a9fd29ff863670b Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 11:02:28 +0200 Subject: [PATCH 07/19] debian_support: Add buster to supported release name --- lib/python/debian_support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/debian_support.py b/lib/python/debian_support.py index f4c42241e0..fb44bc5771 100644 --- a/lib/python/debian_support.py +++ b/lib/python/debian_support.py @@ -194,7 +194,7 @@ class Release(PseudoEnum): pass def listReleases(): releases = {} rels = ("experimental", # For use in [brackets] in the list files. - "potato", "woody", "sarge", "etch", "lenny", "squeeze", "wheezy", "jessie", "stretch", "sid") + "potato", "woody", "sarge", "etch", "lenny", "squeeze", "wheezy", "jessie", "stretch", "buster", "sid") for r in range(len(rels)): releases[rels[r]] = Release(rels[r], r) Release.releases = releases -- 2.11.0
>From f39dee17c7e1246aaa73d890b6ea652da949aef8 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 11:08:13 +0200 Subject: [PATCH 08/19] dist_config: Add support for buster release and add initial list of supported architectures --- lib/python/dist_config.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/python/dist_config.py b/lib/python/dist_config.py index 5821e7618e..0aec8900fc 100644 --- a/lib/python/dist_config.py +++ b/lib/python/dist_config.py @@ -42,6 +42,7 @@ def apply_config(): wheezy_archs = [ 'amd64','armel','armhf','i386' ] jessie_archs = common_archs + [ 'arm64','armhf','ppc64el' ] stretch_archs = [ 'amd64','arm64','armel','armhf','i386','mips','mips64el','mipsel','ppc64el','s390x' ] + buster_archs = [ 'amd64','arm64','armel','armhf','i386','mips','mips64el','mipsel','ppc64el','s390x' ] add_release(name='squeeze', architectures=squeeze_archs, @@ -59,6 +60,10 @@ def apply_config(): architectures=stretch_archs, ) + add_release(name='buster', + architectures=buster_archs, + ) + add_release(name='sid', architectures=jessie_archs, ) -- 2.11.0
>From 9fd97a99687cd3ed2de609e7bbf45c6ccea45f39 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 11:08:39 +0200 Subject: [PATCH 09/19] dist_config: Make sid dependent on own supported architectures --- lib/python/dist_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/python/dist_config.py b/lib/python/dist_config.py index 0aec8900fc..c0fc6ffb48 100644 --- a/lib/python/dist_config.py +++ b/lib/python/dist_config.py @@ -43,6 +43,7 @@ def apply_config(): jessie_archs = common_archs + [ 'arm64','armhf','ppc64el' ] stretch_archs = [ 'amd64','arm64','armel','armhf','i386','mips','mips64el','mipsel','ppc64el','s390x' ] buster_archs = [ 'amd64','arm64','armel','armhf','i386','mips','mips64el','mipsel','ppc64el','s390x' ] + sid_archs = [ 'amd64','arm64','armel','armhf','i386','mips','mips64el','mipsel','ppc64el','s390x' ] add_release(name='squeeze', architectures=squeeze_archs, @@ -65,7 +66,7 @@ def apply_config(): ) add_release(name='sid', - architectures=jessie_archs, + architectures=sid_archs, ) ###################################################################### -- 2.11.0
>From e0c7dae7beb77d57a2817adb13619513896881e6 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 11:26:57 +0200 Subject: [PATCH 10/19] security_db: Update mappings after stretch stable release --- lib/python/security_db.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/python/security_db.py b/lib/python/security_db.py index e018fff055..21134bc78c 100644 --- a/lib/python/security_db.py +++ b/lib/python/security_db.py @@ -476,7 +476,7 @@ class DB: COALESCE((SELECT NOT vulnerable FROM source_packages AS tsecp, source_package_status AS tsecst WHERE tsecp.name = sp.name - AND tsecp.release = 'stretch' AND tsecp.subrelease = 'security' + AND tsecp.release = 'buster' AND tsecp.subrelease = 'security' AND tsecp.archive = sp.archive AND tsecst.bug_name = st.bug_name AND tsecst.package = tsecp.rowid), 0) AS testing_security_fixed, @@ -485,13 +485,13 @@ class DB: (EXISTS (SELECT * FROM package_notes_nodsa AS pnd WHERE pnd.bug_name = st.bug_name AND pnd.package = sp.name - AND pnd.release = 'stretch')) AS no_dsa + AND pnd.release = 'buster')) AS no_dsa FROM source_package_status AS st, source_packages AS sp WHERE st.vulnerable > 0 AND sp.rowid = st.package - AND sp.release = 'stretch' AND sp.subrelease = '' + AND sp.release = 'buster' AND sp.subrelease = '' ORDER BY sp.name, st.urgency, st.bug_name""") - for (name, nickname) in (('stable', 'jessie'), ('oldstable', 'wheezy'), ('oldoldstable', 'squeeze'),): + for (name, nickname) in (('stable', 'stretch'), ('oldstable', 'jessie'), ('oldoldstable', 'wheezy'),): cursor.execute( """CREATE TEMPORARY VIEW %s_status AS SELECT DISTINCT sp.name AS package, st.bug_name AS bug, @@ -575,7 +575,7 @@ class DB: return -1 self.db.createscalarfunction("subreleasepart_to_number", subreleasepart_to_number, 1) - releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid'] + releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'jessie', 'stretch', 'buster', 'sid'] def release_to_number(u): try: return releases.index(u) @@ -1112,7 +1112,7 @@ class DB: """Calculate vulnerable packages. To each package note, a release-specific vulnerability status - is attached. Currently, only stretch/testing is processed. + is attached. Currently, only buster/testing is processed. Returns a list strings describing inconsistencies. """ @@ -1128,7 +1128,7 @@ class DB: # The following does not work because stable->security -> # testing -> unstable propagation is no longer available. if False: - # Ignore stretch/testing because stable issues may be + # Ignore buster/testing because stable issues may be # fast-tracked into testing, bypassing unstable. for (bug_name, pkg_name, rel, unstable_ver, rel_ver) \ in list(cursor.execute( @@ -1136,7 +1136,7 @@ class DB: a.fixed_version, b.fixed_version FROM package_notes a, package_notes b WHERE a.bug_name = b.bug_name AND a.package = b.package - AND a.release = '' AND b.release NOT IN ('', 'stretch') + AND a.release = '' AND b.release NOT IN ('', 'buster') AND a.fixed_version IS NOT NULL AND a.fixed_version_id < b.fixed_version_id""")): b = bugs.BugFromDB(cursor, bug_name) @@ -1252,10 +1252,10 @@ class DB: "SELECT name FROM bugs WHERE NOT not_for_us"): self._calcUnstable(c, bug_name) - self._calcTesting(c, bug_name, 'testing', 'stretch') - self._calcTesting(c, bug_name, 'stable', 'jessie') - self._calcTesting(c, bug_name, 'oldstable', 'wheezy') - self._calcTesting(c, bug_name, 'oldoldstable', 'squeeze') + self._calcTesting(c, bug_name, 'testing', 'buster') + self._calcTesting(c, bug_name, 'stable', 'stretch') + self._calcTesting(c, bug_name, 'oldstable', 'jessie') + self._calcTesting(c, bug_name, 'oldoldstable', 'wheezy') return result @@ -1704,7 +1704,7 @@ class DB: store_value('release/1/' + release, '\n'.join(result)) - for release in ('sid', 'squeeze', 'wheezy', 'jessie', 'stretch'): + for release in ('sid', 'wheezy', 'jessie', 'stretch', 'buster'): gen_release(release) result = result_start @@ -1717,7 +1717,7 @@ class DB: def calculateDebsecan(self): """Calculate all debsecan data.""" - for release in ('', 'squeeze', 'wheezy', 'jessie', 'stretch'): + for release in ('', 'wheezy', 'jessie', 'stretch', 'buster'): self.calculateDebsecan0(release) self.calculateDebsecan1() @@ -1754,7 +1754,7 @@ class DB: """SELECT release_name(release, subrelease, archive) AS release, version FROM source_packages WHERE name = ? - AND release IN ('squeeze', 'wheezy', 'jessie', 'stretch', 'sid') + AND release IN ('wheezy', 'jessie', 'stretch', 'buster', 'sid') GROUP BY release, version ORDER BY release_to_number(release), subrelease_to_number(subrelease), version COLLATE version""", (pkg,)): yield release, version @@ -1809,7 +1809,7 @@ class DB: p.version AS version, s.vulnerable AS vulnerable FROM source_package_status AS s, source_packages AS p WHERE s.bug_name = ? AND p.rowid = s.package - AND release in ('squeeze', 'wheezy', 'jessie', 'stretch', 'sid')) + AND release in ('wheezy', 'jessie', 'stretch', 'buster', 'sid')) GROUP BY package, version, vulnerable ORDER BY package, releasepart_to_number(release), subreleasepart_to_number(release), version COLLATE version""", (bug,)): -- 2.11.0
>From f68ed1e64e3643a6a24796c047bd45278a470790 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:40:56 +0200 Subject: [PATCH 11/19] Makefile: Add architectures for buster --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8a589492ac..15adc6d310 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ squeeze_LTS_ARCHS = amd64 i386 wheezy_ARCHS = amd64 armel armhf i386 jessie_ARCHS = amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x stretch_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x +buster_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x sid_ARCHS = amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x OLDOLDSTABLE = squeeze -- 2.11.0
>From 60e1873bad6fd474ad5fda64d7a9b463e8ea9133 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:41:25 +0200 Subject: [PATCH 12/19] Makefile: Update mapping of releases to codenames --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 15adc6d310..332a8908cd 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,10 @@ stretch_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x buster_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x sid_ARCHS = amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 mips mips64el mipsel powerpc ppc64el s390x -OLDOLDSTABLE = squeeze -OLDSTABLE = wheezy -STABLE = jessie -TESTING = stretch +OLDOLDSTABLE = wheezy +OLDSTABLE = jessie +STABLE = stretch +TESTING = buster all: $(PYTHON) bin/update-db data/security.db -- 2.11.0
>From 94f6fc0f866ac06d65e461d2735ffae82159039e Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:42:01 +0200 Subject: [PATCH 13/19] Makefile: Update phony target to include update-oldoldstable --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 332a8908cd..6cb533ac1f 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ stamps/DLA-syntax: data/DLA/list bin/check-syntax $(PYTHON_MODULES) serve: @bash bin/test-web-server -.PHONY: update-packages update-testing update-stable update-oldstable +.PHONY: update-packages update-testing update-stable update-oldstable update-oldoldstable update-packages: update-testing set -e ; for rel in sid ; do \ for archive in main contrib non-free ; do \ -- 2.11.0
>From 759fd50902d711a5a5d1b4c1ac73a3f866a4a118 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:43:50 +0200 Subject: [PATCH 14/19] Makefile: update-oldold-security target: do not depend on update-lts The separate update for -lts suites is not needed anymore after squeeze and is obsoleted. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6cb533ac1f..6e2ef8ea78 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ update-old-security: done ; \ done -update-oldold-security: update-lts +update-oldold-security: for archive in $(OLDOLDSTABLE); do \ for section in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ -- 2.11.0
>From 311ea4a3c0fce89a444ca690da928dc4bd09a734 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:44:35 +0200 Subject: [PATCH 15/19] Drop obsolted update-backport target needed for squeeze --- Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile b/Makefile index 6e2ef8ea78..c641ed74ae 100644 --- a/Makefile +++ b/Makefile @@ -205,22 +205,8 @@ update-lts-$(OLDOLDSTABLE): data/packages/$${archive}-lts__$${section}_Sources ; \ done ; -BACKPORTS_MIRROR = http://ftp.de.debian.org/debian-backports/dists update-backports: update-backports-$(STABLE) update-backports-$(OLDSTABLE) update-backports-$(OLDOLDSTABLE) -update-backports-$(OLDOLDSTABLE): - set -e && archive=$(shell echo $@ | cut -d- -f3) ; \ - for section in main contrib non-free ; do \ - for arch in $($(shell echo $@ | cut -d- -f3)_ARCHS) ; do \ - $(PYTHON) bin/apt-update-file \ - $(BACKPORTS_MIRROR)/$${archive}-backports/$$section/binary-$$arch/Packages \ - data/packages/$${archive}-backports__$${section}_$${arch}_Packages ; \ - done ; \ - $(PYTHON) bin/apt-update-file \ - $(BACKPORTS_MIRROR)/$${archive}-backports/$$section/source/Sources \ - data/packages/$${archive}-backports__$${section}_Sources ; \ - done ; - update-backports-%: set -e && archive=$(shell echo $@ | cut -d- -f3) ; \ for section in main contrib non-free ; do \ -- 2.11.0
>From 4abc7b71a7c829ce38ff95840b6d1feed7543b95 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:48:12 +0200 Subject: [PATCH 16/19] Makefile: drop obsolteted update-lts targets --- Makefile | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Makefile b/Makefile index c641ed74ae..76017a5108 100644 --- a/Makefile +++ b/Makefile @@ -190,21 +190,6 @@ update-oldold-security: done ; \ done -update-lts: update-lts-$(OLDOLDSTABLE) - -update-lts-$(OLDOLDSTABLE): - set -e && archive=$(shell echo $@ | cut -d- -f3) ; \ - for section in main contrib non-free ; do \ - for arch in $($(shell echo $@ | cut -d- -f3)_LTS_ARCHS) ; do \ - $(PYTHON) bin/apt-update-file \ - $(MIRROR)/dists/$${archive}-lts/$$section/binary-$$arch/Packages \ - data/packages/$${archive}-lts__$${section}_$${arch}_Packages ; \ - done ; \ - $(PYTHON) bin/apt-update-file \ - $(MIRROR)/dists/$${archive}-lts/$$section/source/Sources \ - data/packages/$${archive}-lts__$${section}_Sources ; \ - done ; - update-backports: update-backports-$(STABLE) update-backports-$(OLDSTABLE) update-backports-$(OLDOLDSTABLE) update-backports-%: -- 2.11.0
>From 528f22c89c214e3152e527beac532c82b007327e Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:56:01 +0200 Subject: [PATCH 17/19] Makefile: For update-security trigger update of update-oldold-security --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76017a5108..575d28c769 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ update-testing-security: done SEC_MIRROR = http://security.debian.org/dists -update-security: update-old-security +update-security: update-old-security update-oldold-security for archive in $(STABLE); do \ for section in main contrib non-free ; do \ $(PYTHON) bin/apt-update-file \ -- 2.11.0
>From 50b17e973cf22a7dbdefcdd2ee02a6a5bcd2c035 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 12:56:23 +0200 Subject: [PATCH 18/19] Makefile: Include update-oldoldstable when updating all --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 575d28c769..9b5d6c73e0 100644 --- a/Makefile +++ b/Makefile @@ -230,4 +230,4 @@ update-compare-nvd: done bin/compare-nvd-cve 2> compare-nvd-cve.log -update-all: update-nvd update-lists update-packages update-oldstable update-stable update-security update-testing-security update-packages update-backports all +update-all: update-nvd update-lists update-packages update-oldoldstable update-oldstable update-stable update-security update-testing-security update-packages update-backports all -- 2.11.0
>From c66f6394f8752bae5ba8ed1b81bf43deee74d66c Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso <[email protected]> Date: Sat, 10 Jun 2017 13:18:00 +0200 Subject: [PATCH 19/19] Makefile: remove unused squeeze architectures --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 9b5d6c73e0..004c078117 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,6 @@ BUG_LISTS = $(wildcard data/*/list) # arbitrary at the moment. More architectures can be added later. MIRROR = http://debian.csail.mit.edu/debian/ -squeeze_ARCHS = amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 -squeeze_LTS_ARCHS = amd64 i386 wheezy_ARCHS = amd64 armel armhf i386 jessie_ARCHS = amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x stretch_ARCHS = amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x -- 2.11.0
