add upgrade: field in advisory files, to get rid of the need to manually

edit that FIXME every time


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

1 files changed, 9 insertions, 6 deletions

diff --git a/data/DTSA/dtsa b/data/DTSA/dtsa
index 03caab0a3b..10504fd84b 100755
--- a/data/DTSA/dtsa
+++ b/data/DTSA/dtsa
@@ -36,6 +36,7 @@ def process_dtsa(id, sid):
 	descr = []
 	author = ""
 	scope = ""
+	upgrade = "apt-get upgrade"
 	debian_specific = False
 
 	dtsa_id = "DTSA-" + id + "-" + str(sid)
@@ -65,6 +66,8 @@ def process_dtsa(id, sid):
 			testing_fix = i[12:].strip()
 		elif i.startswith("sid-fix:"):
 			sid_fix = i[8:].strip()
+		elif i.startswith("upgrade:"):
+			upgrade = i[8:].strip()
 		elif d:
 			descr.append(i.strip())
 		elif i == "\n" and d == False:
@@ -73,11 +76,11 @@ def process_dtsa(id, sid):
 	if len(cve) == 0:
 		print "No CVE assignments seem to have been made for this issue"
 
-	export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, dtsa_id, 1, author, scope, debian_specific)  
+	export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, dtsa_id, 1, author, scope, debian_specific, upgrade)
 	
 	print "A html representation has been generated as",dtsa_id + ".html"
 	
-	export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, dtsa_id, 1, author, scope, debian_specific)  
+	export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, dtsa_id, 1, author, scope, debian_specific, upgrade)
 
 	print "A textual representation has been generated as", dtsa_id
 	print "You can publish it with the sndadvisory script"
@@ -103,7 +106,7 @@ def construct_dtsa_list(date, dtsa_id, cve, src, vuln_type, testing_fix):
 	l_f.write("\tTODO: unreleased\n")
 	l_f.close()
 
-def export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, id, rev, author, scope, debian_specific):
+def export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, id, rev, author, scope, debian_specific, upgrade):
 	html = open(os.getcwd() + "/" + id + ".html", "w")
 	
 	# Open, read, write and close the header
@@ -158,7 +161,7 @@ def export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_a
 	html.write("<dt>If you have the secure testing lines in your sources.list, you can update by running this command as root:</dt>\n")
 	html.write("\n")
 
-	html.write("<dd>apt-get update && apt-get install "+ src + " FIXME, I'm broken </dd>\n")
+	html.write("<dd>apt-get update && "+ upgrade + "</dd>\n")
 	html.write("<br>\n")
 	html.write("\n")
 	# FIXME, use python-crypto for inclusion of SHA-1 checksums
@@ -175,7 +178,7 @@ def export_html(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_a
 	pass
 
 
-def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, id, rev, author, scope, debian_specific):
+def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_advisory, id, rev, author, scope, debian_specific, upgrade):
 	ascii = open(os.getcwd() + "/" + id, "w")
 
 	# FIXME: use a nice external template with alignment specifiers
@@ -243,7 +246,7 @@ def export_ascii(src, date, vuln_type, cve, testing_fix, sid_fix, descr, vendor_
 	ascii.write("To install the update, run this command as root:\n")
 	ascii.write("\n")
 
-	ascii.write("apt-get update && apt-get install "+ src + "FIXME, I'm broken \n")
+	ascii.write("apt-get update && "+ upgrade + "\n")
 	ascii.write("\n")
   
 	ascii.write("For further information about the Debian testing security team, please refer\n")