lenny, squeeze, wheezy

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

7 files changed, 30 insertions, 26 deletions

diff --git a/bin/compare-testing-status b/bin/compare-testing-status
index b8ece4885d..82b7af6dd6 100755
--- a/bin/compare-testing-status
+++ b/bin/compare-testing-status
@@ -7,7 +7,7 @@
 use strict;
 use DBI;
 
-my $TESTING="squeeze";
+my $TESTING="wheezy";
 my $MAILTO='secure-testing-team@lists.alioth.debian.org';
 my $MAILFROM='sf@sfritsch.de';
 
diff --git a/bin/dsa2list b/bin/dsa2list
index 093b03c2a4..bdd8742020 100755
--- a/bin/dsa2list
+++ b/bin/dsa2list
@@ -70,7 +70,7 @@ dscurl_re = re.compile(r'^\s*(http://\S+\.dsc).*')
 # Variants used by "dak new-security-install"
 re_date1 = re.compile(r'^([A-Z][a-z][a-z])[a-z]* (\d+), (2\d{3}).*')
 release_headline1_re = re.compile(r'^Debian [0-9.]+ \(([a-z]+)\).*')
-release_map = {'stable' : 'lenny', 'oldstable' : 'etch'}
+release_map = {'stable' : 'squeeze', 'oldstable' : 'lenny'}
 
 def process_file(file):
     cve_names = {}
diff --git a/bin/gen-DSA b/bin/gen-DSA
index 886effbcd7..a115c113fd 100755
--- a/bin/gen-DSA
+++ b/bin/gen-DSA
@@ -20,9 +20,9 @@
 
 set -e
 
-OLDSTABLE=
-STABLE=lenny
-TESTING=squeeze
+OLDSTABLE=lenny
+STABLE=squeeze
+TESTING=wheezy
 
 export LANG=C
 
diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index d2b3a5bf69..42bc43cc30 100644
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -734,13 +734,13 @@ 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='lenny-backports')
+            rel='squeeze-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='etch-backports')
+            rel='lenny-backports')
 
     def page_status_dtsa_candidates(self, path, params, url):
         bf = BugFilter(params)
@@ -754,11 +754,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 = 'squeeze'
+                 AND testing.release = 'wheezy'
                  AND testing.subrelease = ''
                  AND testing.archive = testing_status.section
                  AND stable.name = testing_status.package
-                 AND stable.release = 'lenny'
+                 AND stable.release = 'squeeze'
                  AND stable.subrelease = 'security'
                  AND stable.archive = testing_status.section),
                 (SELECT range_remote FROM nvd_data
@@ -839,7 +839,7 @@ checker to find out why they have not entered testing yet."""),
             old_pkg = ''
             old_dsc = ''
             last_displayed = ''
-            releases = ('sid', 'squeeze', 'lenny')
+            releases = ('sid', 'wheezy', 'squeeze', 'lenny')
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
@@ -884,7 +884,7 @@ checker to find out why they have not entered testing yet."""),
             old_dsc = ''
             old_name = ''
             last_displayed = ''
-            releases = ('sid', 'squeeze', 'lenny')
+            releases = ('sid', 'wheezy', 'squeeze', 'lenny')
             for (pkg_name, bug_name, release, desc) in self.db.cursor().execute(
                     """SELECT DISTINCT sp.name, st.bug_name, sp.release,
                     bugs.description
diff --git a/lib/python/debian_support.py b/lib/python/debian_support.py
index 925bb96802..e39c2a1e5a 100644
--- a/lib/python/debian_support.py
+++ b/lib/python/debian_support.py
@@ -177,7 +177,7 @@ class Release(PseudoEnum): pass
 
 def listReleases():
     releases = {}
-    rels = ("potato", "woody", "sarge", "etch", "lenny", "squeeze", "sid")
+    rels = ("potato", "woody", "sarge", "etch", "lenny", "squeeze", "wheezy", "sid")
     for r in range(len(rels)):
         releases[rels[r]] = Release(rels[r], r)
     Release.releases = releases
diff --git a/lib/python/dist_config.py b/lib/python/dist_config.py
index f58e9f08fd..16c0c54c37 100644
--- a/lib/python/dist_config.py
+++ b/lib/python/dist_config.py
@@ -47,6 +47,10 @@ def apply_config():
     add_release(name='squeeze',
                 architectures=squeeze_archs,
                 )
+    
+    add_release(name='wheezy',
+                architectures=squeeze_archs,
+                )
 
     add_release(name='sid',
                 architectures=squeeze_archs,
diff --git a/lib/python/security_db.py b/lib/python/security_db.py
index 030fd77872..35c10c646b 100644
--- a/lib/python/security_db.py
+++ b/lib/python/security_db.py
@@ -361,7 +361,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 = 'squeeze' AND tsecp.subrelease = 'security'
+            AND tsecp.release = 'wheezy' 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,
@@ -370,13 +370,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 = 'squeeze')) AS no_dsa
+            AND pnd.release = 'wheezy')) 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 = 'squeeze' AND sp.subrelease = ''
+            AND sp.release = 'wheezy' AND sp.subrelease = ''
             ORDER BY sp.name, st.urgency, st.bug_name""")
 
-        for (name, nickname) in (('stable', 'lenny'), ('oldstable', 'etch'),):
+        for (name, nickname) in (('stable', 'squeeze'), ('oldstable', 'lenny'),):
             cursor.execute(
                 """CREATE VIEW %s_status AS
                 SELECT DISTINCT sp.name AS package, st.bug_name AS bug,
@@ -433,7 +433,7 @@ class DB:
                 return 999
         self.db.createscalarfunction("urgency_to_number", urgency_to_number, 1)
 
-        releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'sid']
+        releases = ['potato', 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy', 'sid']
         def release_to_number(u):
             try:
                 return releases.index(u)
@@ -933,7 +933,7 @@ class DB:
         """Calculate vulnerable packages.
 
         To each package note, a release-specific vulnerability status
-        is attached.  Currently, only squeeze/testing is processed.
+        is attached.  Currently, only wheezy/testing is processed.
 
         Returns a list strings describing inconsistencies.
         """
@@ -949,7 +949,7 @@ class DB:
         # The following does not work because stable->security ->
         # testing -> unstable propagation is no longer available.
         if False:
-            # Ignore squeeze/testing because stable issues may be
+            # Ignore wheezy/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(
@@ -957,7 +957,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 ('', 'squeeze')
+            AND a.release = '' AND b.release NOT IN ('', 'wheezy')
             AND a.fixed_version IS NOT NULL
             AND a.fixed_version_id < b.fixed_version_id""")):
                 b = bugs.BugFromDB(cursor, bug_name)
@@ -1073,9 +1073,9 @@ class DB:
             "SELECT name FROM bugs WHERE NOT not_for_us"):
 
             self._calcUnstable(c, bug_name)
-            self._calcTesting(c, bug_name, 'testing', 'squeeze')
-            self._calcTesting(c, bug_name, 'stable', 'lenny')
-            self._calcTesting(c, bug_name, 'oldstable', 'etch')
+            self._calcTesting(c, bug_name, 'testing', 'wheezy')
+            self._calcTesting(c, bug_name, 'stable', 'squeeze')
+            self._calcTesting(c, bug_name, 'oldstable', 'lenny')
 
         return result
 
@@ -1520,7 +1520,7 @@ class DB:
 
             store_value('release/1/' + release, '\n'.join(result))
 
-        for release in ('sid', 'etch', 'lenny', 'squeeze'):
+        for release in ('sid', 'lenny', 'squeeze', 'wheezy'):
             gen_release(release)
 
         result = result_start
@@ -1533,7 +1533,7 @@ class DB:
                 
     def calculateDebsecan(self):
         """Calculate all debsecan data."""
-        for release in ('', 'etch', 'lenny', 'squeeze'):
+        for release in ('', 'lenny', 'squeeze', 'wheezy'):
             self.calculateDebsecan0(release)
         self.calculateDebsecan1()
         
@@ -1672,7 +1672,7 @@ class DB:
             ORDER BY st2.vulnerable DESC), 1)) AS vulnerable
             FROM source_packages AS sp, source_package_status AS st, bugs
             WHERE sp.name = ?
-	    AND sp.release IN ('lenny', 'squeeze', 'sid')
+	    AND sp.release IN ('lenny', 'squeeze', 'wheezy', 'sid')
 	    AND sp.subrelease <> 'security'
             AND st.package = sp.rowid
             AND bugs.name = st.bug_name