X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Famber.advisory;h=50d59e94006c58705cfeda0f07bb3353eeb76f34;hb=704108dfd7a9afe38cdb18463b71bd4739dda9ce;hp=a6987bbdf93d0ddd15f0a5b4df4d2f0e31e1e822;hpb=abb6b9019c809b235d5e0f9dfaa543a771fd9ba5;p=dak.git

diff --git a/templates/amber.advisory b/templates/amber.advisory
index a6987bbd..50d59e94 100644
--- a/templates/amber.advisory
+++ b/templates/amber.advisory
@@ -4,36 +4,65 @@ __BCC__
 Subject: Template Advisory __ADVISORY__
 
 ------------------------------------------------------------------------
-Debian Security Advisory __ADVISORY__
-http://www.debian.org/security/
-
-Issued by __WHOAMI__ <security@debian.org>
+Debian Security Advisory __ADVISORY__              security@debian.org
+http://www.debian.org/security/                         __WHOAMI__
 __DATE__
 ------------------------------------------------------------------------
 
 Package        : __PACKAGE__
-Problem type   : 
-Debian-specific: 
+Vulnerability  : XXX
+Problem type   : local/remote XXX
+Debian-specific: XXX
+CVE Id(s)      : XXX
+CERT advisory  : XXX
+BugTraq ID     : XXX
+Debian Bug     : XXX
 
 ...
 
-__ADVISORY_TEXT__
+[single issue]
+For the stable distribution (woody), this problem has been fixed in version XXX
+
+For the old stable distribution (potato), this problem has been fixed in
+version XXX
+
+[multiple issues]
+For the stable distribution (woody), these problems have been fixed in version
+XXX
+
+For the old stable distribution (potato), these problems have been fixed in
+version XXX
 
-------------------------------------------------------------------------
 
-Obtaining updates:
+We recommend that you upgrade your __PACKAGE__ package.
 
-  By hand:
+Upgrade instructions
+--------------------
 
-    wget URL
-        will fetch the file for you.
-    dpkg -i FILENAME.deb
-        will install the fetched file.
+wget url
+        will fetch the file for you
+dpkg -i file.deb
+        will install the referenced file.
+
+If you are using the apt-get package manager, use the line for
+sources.list as given below:
+
+apt-get update
+        will update the internal database
+apt-get upgrade
+        will install corrected packages
+
+You may use an automated update by adding the resources from the
+footer to the proper configuration.
+
+__ADVISORY_TEXT__
 
-  With apt:
 
-    deb http://security.debian.org/ potato/updates main
-        added to /etc/apt/sources.list will give you access to potato updates.
-    deb http://security.debian.org/ woody/updates main
-        added to /etc/apt/sources.list will give you access to woody updates.
+  These files will probably be moved into the stable distribution on
+  its next update.
 
+---------------------------------------------------------------------------------
+For apt-get: deb http://security.debian.org/ stable/updates main
+For dpkg-ftp: ftp://security.debian.org/debian-security dists/stable/updates/main
+Mailing list: debian-security-announce@lists.debian.org
+Package info: `apt-cache show <pkg>' and http://packages.debian.org/<pkg>