fix some more references to etch

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

5 files changed, 11 insertions, 8 deletions

diff --git a/data/CVE/list b/data/CVE/list
index 51c315c787..449c04b00d 100644
--- a/data/CVE/list
+++ b/data/CVE/list
@@ -85,7 +85,7 @@ CVE-2007-2756 (The gdPngReadData function in libgd 2.0.34 allows user-assisted .
 CVE-2007-2755 (The PrecisionID Barcode 1.9 ActiveX control in ...)
 	TODO: check
 CVE-2007-2754 (Integer signedness error in truetype/ttgload.c in Freetype 2.3.4 and ...)
-	- freetype <unfixed> (bug filed)
+	- freetype <unfixed> (bug #425625)
 CVE-2007-2753 (RunawaySoft Haber portal 1.0 stores sensitive information under the ...)
 	TODO: check
 CVE-2007-2752 (SQL injection vulnerability in devami.asp in RunawaySoft Haber portal ...)
diff --git a/data/DTSA/dtsa b/data/DTSA/dtsa
index 9f21079585..1d5c41203b 100755
--- a/data/DTSA/dtsa
+++ b/data/DTSA/dtsa
@@ -1,4 +1,5 @@
-#!/usr/bin/python 
+#!/usr/bin/python
+
 import sys, getopt, os, glob
 
 # TODO:
@@ -14,6 +15,8 @@ import sys, getopt, os, glob
 
 announce_mail_address = "secure-testing-announce@lists.alioth.debian.org"
 testing_name = "lenny"
+stable_name = "etch"
+oldstable_name = "sarge"
 
 def print_usage():
 	print "dtsa [-p | -u] dtsa-id major number"
@@ -148,7 +151,7 @@ def export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_a
 	html.write("</dd>\n")
 
 	html.write("<br>")
-	html.write("<dt>For the testing distribution (etch) this is fixed in version " + testing_fix + "</dt>\n")
+	html.write("<dt>For the testing distribution (" + testing_name + ") this is fixed in version " + testing_fix + "</dt>\n")
 
 	if len(sid_fix) > 0:
 		html.write("<dt>For the unstable distribution (sid) this is fixed in version " + sid_fix + "</dt>\n")
@@ -211,7 +214,7 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
 		ascii.write(i + "\n")
 	ascii.write("\n")
 
-	ascii.write("For the testing distribution (etch) this is fixed in version\n")
+	ascii.write("For the testing distribution (" + testing_name + ") this is fixed in version\n")
 	ascii.write(testing_fix + "\n")
 	ascii.write("\n")
 
@@ -226,7 +229,7 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
 	ascii.write("\n")
 
 	ascii.write("The Debian testing security team does not track security issues for the\n")
-	ascii.write("stable (etch) and oldstable (sarge) distributions. If stable is vulnerable,\n")
+	ascii.write("stable (" + stable_name + ") and oldstable (" + oldstable_name + ") distributions. If stable is vulnerable,\n")
 	ascii.write("the Debian security team will make an announcement once a fix is ready.\n")
 	ascii.write("\n")
 
diff --git a/website/DTSA/DTSA-35-1.html b/website/DTSA/DTSA-35-1.html
index ee4baf7ebf..5f759ce437 100644
--- a/website/DTSA/DTSA-35-1.html
+++ b/website/DTSA/DTSA-35-1.html
@@ -57,7 +57,7 @@
 insufficient validation of 802.11 authentication packets, which allows the &nbsp;<br>
 execution of arbitrary code.&nbsp;<br>
 </dd>
-<br><dt>For the testing distribution (etch) this is fixed in version 1:0.8-0.1lenny1</dt>
+<br><dt>For the testing distribution (lenny) this is fixed in version 1:0.8-0.1lenny1</dt>
 <dt>For the unstable distribution (sid) this is fixed in version 1:0.7-3</dt>
 <br><dt>This upgrade is recommended if you use aircrack-ng.<dt>
 <br><dt>If you have the secure testing lines in your sources.list, you can update by running this command as root:</dt>
diff --git a/website/DTSA/DTSA-36-1.html b/website/DTSA/DTSA-36-1.html
index fb7f120fdb..b481c3963d 100644
--- a/website/DTSA/DTSA-36-1.html
+++ b/website/DTSA/DTSA-36-1.html
@@ -56,7 +56,7 @@
 <dd>Multiple buffer overflows in MyDNS allow remote attackers to cause a denial of &nbsp;<br>
 service (daemon crash) and possibly execute arbitrary code.&nbsp;<br>
 </dd>
-<br><dt>For the testing distribution (etch) this is fixed in version 1:1.1.0-7.1lenny1</dt>
+<br><dt>For the testing distribution (lenny) this is fixed in version 1:1.1.0-7.1lenny1</dt>
 <dt>For the unstable distribution (sid) this is fixed in version 1:1.1.0-8</dt>
 <br><dt>This upgrade is recommended if you use mydns.<dt>
 <br><dt>If you have the secure testing lines in your sources.list, you can update by running this command as root:</dt>
diff --git a/website/DTSA/DTSA-37-1.html b/website/DTSA/DTSA-37-1.html
index 07e1832396..dbc885a9bf 100644
--- a/website/DTSA/DTSA-37-1.html
+++ b/website/DTSA/DTSA-37-1.html
@@ -71,7 +71,7 @@ CVE-2007-2029 &nbsp;<br>
 It was discovered that a file descriptor leak in the PDF handler may lead to &nbsp;<br>
 denial of service.&nbsp;<br>
 </dd>
-<br><dt>For the testing distribution (etch) this is fixed in version 0.90.1-3lenny2</dt>
+<br><dt>For the testing distribution (lenny) this is fixed in version 0.90.1-3lenny2</dt>
 <dt>For the unstable distribution (sid) this is fixed in version 0.90.2-1</dt>
 <br><dt>This upgrade is recommended if you use clamav.<dt>
 <br><dt>If you have the secure testing lines in your sources.list, you can update by running this command as root:</dt>