add support for oldoldstable and stretch and make jessie the new stable release

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@33868 e39458fd-73e7-0310-bf30-c45bca0a0e42

3 files changed, 38 insertions, 18 deletions

diff --git a/bin/add-dsa-needed.sh b/bin/add-dsa-needed.sh
index 04bd36daba..de70859f67 100755
--- a/bin/add-dsa-needed.sh
+++ b/bin/add-dsa-needed.sh
@@ -47,7 +47,7 @@ case "${1:-}" in
     ;;
 esac
 
-for release in oldstable stable; do
+for release in oldoldstable oldstable stable; do
     HOME=$tmpd w3m $turl/$release > $tmpd/$release.txt
     touch $tmpd/toadd-$release.txt
     seen_marker=false
@@ -76,16 +76,17 @@ for release in oldstable stable; do
     done < $tmpd/$release.txt
 done
 
-cat $tmpd/toadd-stable.txt $tmpd/toadd-oldstable.txt | sort | uniq -d |
+cat $tmpd/toadd-stable.txt $tmpd/toadd-oldstable.txt $tmpd/toadd-oldoldstable.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-oldoldstable.txt
 done
 
-# Skip oldstable for now as it is an LTS release, tracked with
+# Skip oldoldstable for now as it is an LTS release, tracked with
 # dla-needed:
-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
diff --git a/bin/tracker_data.py b/bin/tracker_data.py
index 3c04c41c46..f05dd256a3 100644
--- a/bin/tracker_data.py
+++ b/bin/tracker_data.py
@@ -22,9 +22,10 @@ import requests
 import six
 
 RELEASES = {
-    'oldstable': 'squeeze',
-    'stable': 'wheezy',
-    'testing': 'jessie',
+    'oldoldstable': 'squeeze',
+    'oldstable': 'wheezy',
+    'stable': 'jessie',
+    'testing': 'stretch',
     'unstable': 'sid',
     'experimental': 'experimental',
     # LTS specific aliases
diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index 0eb9f72bd9..76c57a041c 100644
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -127,6 +127,8 @@ class TrackerService(webservice_base_class):
         self.register('*', self.page_object)
         self.register('redirect/*', self.page_redirect)
         self.register('source-package/*', self.page_source_package)
+        self.register('status/release/oldoldstable',
+                      self.page_status_release_oldoldstable)
         self.register('status/release/oldstable',
                       self.page_status_release_oldstable)
         self.register('status/release/stable', self.page_status_release_stable)
@@ -134,6 +136,8 @@ class TrackerService(webservice_base_class):
                       self.page_status_release_stable_backports)
         self.register('status/release/oldstable-backports',
                       self.page_status_release_oldstable_backports)
+        self.register('status/release/oldoldstable-backports',
+                      self.page_status_release_oldoldstable_backports)
         self.register('status/release/testing',
                       self.page_status_release_testing)
         self.register('status/release/unstable',
@@ -224,6 +228,10 @@ aware of and/or help us improve the quality of this information by """,
              'Vulnerable packages in the oldstable suite'),
             ('status/release/oldstable-backports',
              'Vulnerable packages in backports for oldstable'),
+            ('status/release/oldoldstable',
+             'Vulnerable packages in the oldoldstable suite'),
+            ('status/release/oldoldstable-backports',
+             'Vulnerable packages in backports for oldoldstable'),
             ('status/dtsa-candidates', "Candidates for DTSAs"),
             ('status/todo', 'TODO items'),
             ('status/undetermined', 'Packages that may be vulnerable but need to be checked (undetermined issues)'),
@@ -658,8 +666,8 @@ to improve our documentation and procedures, so feedback is welcome.""")])])
                         replacement='No known security announcements.')
              ])
 
-    def page_status_release_stable_oldstable(self, release, params, url):
-        assert release in ('stable', 'oldstable')
+    def page_status_release_stable_oldstable_oldoldstable(self, release, params, url):
+        assert release in ('stable', 'oldstable', 'oldoldstable',)
 
         bf = BugFilter(params)
 
@@ -711,9 +719,12 @@ to improve our documentation and procedures, so feedback is welcome.""")])])
              self.nvd_text])
 
     def page_status_release_stable(self, path, params, url):
-        return self.page_status_release_stable_oldstable('stable', params, url)
+        return self.page_status_release_stable_oldstable_oldoldstable('stable', params, url)
     def page_status_release_oldstable(self, path, params, url):
-        return self.page_status_release_stable_oldstable('oldstable',
+        return self.page_status_release_stable_oldstable_oldoldstable('oldstable',
+                                                         params, url)
+    def page_status_release_oldstable(self, path, params, url):
+        return self.page_status_release_stable_oldstable_oldoldstable('oldoldstable',
                                                          params, url)
 
     def page_status_release_testing(self, path, params, url):
@@ -837,14 +848,21 @@ 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='wheezy-backports')
+            rel='jessie-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')
+
+    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')
 
+
     def page_status_dtsa_candidates(self, path, params, url):
         bf = BugFilter(params,nonodsa=True)
 
@@ -941,14 +959,14 @@ checker to find out why they have not entered testing yet."""),
             old_pkg = ''
             old_dsc = ''
             last_displayed = ''
-            releases = ('sid', 'jessie', 'wheezy', 'squeeze')
+            releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze')
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
                     FROM source_package_status AS st, source_packages AS sp, bugs
                     WHERE st.vulnerable == 2 AND sp.rowid = st.package
                     AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                    OR sp.release = ? )
+                    OR sp.release = ? OR sp.release = ? )
                     AND sp.subrelease = '' AND st.bug_name == bugs.name
                     ORDER BY sp.name, st.bug_name""", releases):
 
@@ -986,14 +1004,14 @@ checker to find out why they have not entered testing yet."""),
             old_dsc = ''
             old_name = ''
             last_displayed = ''
-            releases = ('sid', 'jessie', 'wheezy', 'squeeze')
+            releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze')
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
                     FROM source_package_status AS st, source_packages AS sp, bugs
                     WHERE st.vulnerable > 0 AND sp.rowid = st.package
                     AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                    OR sp.release = ? ) AND st.urgency == 'unimportant'
+                    OR sp.release = ? OR sp.release = ? ) AND st.urgency == 'unimportant'
                     AND sp.subrelease = '' AND st.bug_name == bugs.name
                     ORDER BY sp.name, st.bug_name""", releases):
 
@@ -1260,7 +1278,7 @@ Debian bug number.'''),
         status = defaultdict(lambda: defaultdict(dict))
         urgency = defaultdict(lambda: defaultdict(dict))
         nodsa = defaultdict(lambda: defaultdict(dict))
-        supported_releases = ('sid', 'jessie', 'wheezy', 'squeeze')
+        supported_releases = ('sid', 'stretch', 'jessie', 'wheezy', 'squeeze')
         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
@@ -1283,7 +1301,7 @@ Debian bug number.'''),
                 FROM source_package_status AS st, source_packages AS sp, bugs
                 WHERE sp.rowid = st.package AND st.bug_name = bugs.name
                 AND ( sp.release = ? OR sp.release = ? OR sp.release = ?
-                OR sp.release = ? )
+                OR sp.release = ? OR sp.release = ? )
                 ORDER BY sp.name, st.bug_name, sp.release, sp.subrelease""" , supported_releases):
 
             ### to ease debugging...: