[Secure-testing-commits] r21342 - bin doc

[Raphael Geissert]

Author: geissert
Date: 2013-02-19 19:27:42 +0000 (Tue, 19 Feb 2013)
New Revision: 21342

Modified:
   bin/gen-DSA
   bin/gen-DSA.py
   doc/DSA.template
Log:
When passing multiple CVE ids, generate a list of them

The generated CVE listing is more or less already followed by almost
everybody except fw, who's style is slightly different (no empty line
after the id and tabs instead of blanks.)



Modified: bin/gen-DSA
===================================================================
--- bin/gen-DSA	2013-02-19 16:55:30 UTC (rev 21341)
+++ bin/gen-DSA	2013-02-19 19:27:42 UTC (rev 21342)
@@ -152,6 +152,7 @@
 CVE="$(toupper "$3")"
 BUGNUM="${4#\#}"
 REFERENCES=0
+TEXT=
 
 CVE="$(split_n_sort "$CVE")"
 cve_spacing=
@@ -167,8 +168,22 @@
     grep -wq "^$id" data/CVE/list || {
 	warn "'$id' is not known" >&2
     }
+
+    TEXT="$TEXT\n\n$id\n\n    Description"
 done
 
+if [ $REFERENCES -eq 1 ]; then
+    TEXT=
+fi
+
+if [ -n "$TEXT" ]; then
+    TEXT="Brief introduction $TEXT"
+    
+    if ! $save; then
+	TEXT="The CVE ids will be listed here when --save'ing"
+    fi
+fi
+
 case "$DSAID" in
     *-*|'')
 	:
@@ -267,6 +282,7 @@
 setvar TESTING
 setvar SPACEDDATE
 setvar DATE
+setvar TEXT "${TEXT:-DSA text goes here}"
 
 for dist in $OLDSTABLE $STABLE $TESTING UNSTABLE; do
     version="$(eval 'printf "%s" "$'"$dist"_VERSION'"')"

Modified: bin/gen-DSA.py
===================================================================
--- bin/gen-DSA.py	2013-02-19 16:55:30 UTC (rev 21341)
+++ bin/gen-DSA.py	2013-02-19 19:27:42 UTC (rev 21342)
@@ -262,6 +262,7 @@
         "TESTING_VERSION" : testing_version or "<missing>",
         "UNSTABLE_VERSION" : unstable_version or "<missing>",
         "SPACEDDEBFULLNAME" : gecos().rjust(24),
+        "TEXT" : "DSA text goes here",
         })
 updatedlist = fordsalist({
         "stable" : stable_version,

Modified: doc/DSA.template
===================================================================
--- doc/DSA.template	2013-02-19 16:55:30 UTC (rev 21341)
+++ doc/DSA.template	2013-02-19 19:27:42 UTC (rev 21342)
@@ -15,6 +15,8 @@
 CVE ID         : $CVE
 Debian Bug     : $BUGNUM
 
+$TEXT
+
 For the stable distribution ($STABLE), this problem has been fixed in
 version $$STABLE_VERSION.