Revert "Merge commit 'stew/content_generation' into merge"

[dak.git] / templates / security-install.advisory

diff --git a/templates/security-install.advisory b/templates/security-install.advisory
index 7f523292edd9cbaad6d1bd485ec05ae3971d9e51..eea2e937daa2c0859916e906896af2aa4b015c8f 100644 (file)
--- a/templates/security-install.advisory
+++ b/templates/security-install.advisory
@@ -1,15 +1,13 @@
 From: __DAK_ADDRESS__
 To: __WHOAMI__ <dak@security.debian.org>
 __BCC__
 From: __DAK_ADDRESS__
 To: __WHOAMI__ <dak@security.debian.org>
 __BCC__

-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
+X-Debian-Package: __SOURCE__

 Subject: Template Advisory __ADVISORY__
 
 ------------------------------------------------------------------------
 Subject: Template Advisory __ADVISORY__
 
 ------------------------------------------------------------------------

-Debian Security Advisory __ADVISORY__              security@debian.org
+Debian Security Advisory __ADVISORY__                  security@debian.org

 http://www.debian.org/security/                         __WHOAMI__
 http://www.debian.org/security/                         __WHOAMI__

-__DATE__
+__DATE__                   http://www.debian.org/security/faq

 ------------------------------------------------------------------------
 
 Package        : __PACKAGE__
 ------------------------------------------------------------------------
 
 Package        : __PACKAGE__


@@ -21,22 +19,28 @@ CERT advisory  : XXX
 BugTraq ID     : XXX
 Debian Bug     : XXX
 
 BugTraq ID     : XXX
 Debian Bug     : XXX
 

-...
+Several local/remote vulnerabilities have been discovered in...
+The Common
+Vulnerabilities and Exposures project identifies the following problems:

 
 [single issue]
 
 [single issue]

-For the stable distribution (woody), this problem has been fixed in version XXX
+Foo discovered that

 
 

-For the old stable distribution (potato), this problem has been fixed in
+
+[single issue]
+For the stable distribution (etch), this problem has been fixed in version XXX
+__PACKAGE__
+
+For the unstable distribution (sid), this problem has been fixed in

 version XXX
 
 [multiple issues]
 version XXX
 
 [multiple issues]

-For the stable distribution (woody), these problems have been fixed in version
-XXX
+For the stable distribution (etch), these problems have been fixed in version
+__PACKAGE__

 
 

-For the old stable distribution (potato), these problems have been fixed in
+For the unstable distribution (sid), these problems have been fixed in

 version XXX
 
 version XXX
 

-

 We recommend that you upgrade your __PACKAGE__ package.
 
 Upgrade instructions
 We recommend that you upgrade your __PACKAGE__ package.
 
 Upgrade instructions


@@ -58,6 +62,10 @@ apt-get upgrade
 You may use an automated update by adding the resources from the
 footer to the proper configuration.
 
 You may use an automated update by adding the resources from the
 footer to the proper configuration.
 

+
+Debian GNU/Linux 4.0 alias etch
+-------------------------------
+

 __ADVISORY_TEXT__
 
 
 __ADVISORY_TEXT__