dsa2list: add support for the "dak new-security-install" format

This should not be used for DSAs, but it's out there anyway.

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

1 files changed, 19 insertions, 1 deletions

diff --git a/bin/dsa2list b/bin/dsa2list
index ad531ad95c..828aaffbc0 100755
--- a/bin/dsa2list
+++ b/bin/dsa2list
@@ -59,13 +59,18 @@ def fetch_dsc(url):
     return (source, version)
 
 re_title = re.compile(r'^Subject: .*\[DSA (\d+-\d+)\] .* fix(?:es)? (.*)$')
-re_date = re.compile(r'^([A-Z][a-z][a-z])[a-z]* (\d+)[a-z]+, (\d+)\s+http://.*')
+re_date = re.compile(r'^([A-Z][a-z][a-z])[a-z]* (\d+)[a-z]*, (\d+)\s+http://.*')
 
 re_cve = re.compile('(CVE-\d{4}-\d{4})')
 release_headline_re = re.compile(
     r'^Debian GNU/Linux [0-9.]+ (?:\(|alias) ([a-z]+).*')
 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' : 'etch', 'oldstable' : 'sarge'}
+
 def process_file(file):
     cve_names = {}
     package_notes = []
@@ -100,6 +105,19 @@ def process_file(file):
             packages[source] = True
             package_notes.append((release, source, version))
 
+        # Variants used by "dak new-security-install"
+
+        match = re_date1.match(line)
+        if match:
+            (m, d, y) = match.groups()
+            date = "%02d %s %s" % (int(d), m, y)
+            continue
+        match  = release_headline1_re.match(line)
+        if match:
+            (release,) = match.groups()
+            release = release_map[release]
+            continue
+
     assert date
     assert title
     packages = packages.keys()