new note sort of conflicts with the existing boilerplate; remove that and mention final release of 2.6.24 in new note

git-svn-id: svn+ssh://svn.debian.org/svn/kernel-sec@1746 e094ebfe-e918-0410-adfb-c712417f3574

1 files changed, 3 insertions, 10 deletions

diff --git a/dsa-texts/2.6.18.dfsg.1-26etch2 b/dsa-texts/2.6.18.dfsg.1-26etch2
index 3f6c01d2..8432c509 100644
--- a/dsa-texts/2.6.18.dfsg.1-26etch2
+++ b/dsa-texts/2.6.18.dfsg.1-26etch2
@@ -16,7 +16,9 @@ NOTE: This kernel update marks the final planned kernel security
 update for the 2.6.18 kernel in the Debian release 'etch'.
 Although security support for 'etch' officially ended on
 Feburary 15th, 2010, this update was already in preparation
-before that date.
+before that date.  A final update that includes fixes for these
+issues in the 2.6.24 kernel is also in preparation and will be
+released shortly.
 
 Several vulnerabilities have been discovered in the Linux kernel that
 may lead to a denial of service or privilege escalation. The Common
@@ -94,15 +96,6 @@ version 2.6.18.dfsg.1-26etch2.
 We recommend that you upgrade your linux-2.6, fai-kernels, and
 user-mode-linux packages.
 
-Note: Debian 'etch' includes linux kernel packages based upon both the
-2.6.18 and 2.6.24 linux releases.  All known security issues are
-carefully tracked against both packages and both packages will receive
-security updates until security support for Debian 'etch'
-concludes. However, given the high frequency at which low-severity
-security issues are discovered in the kernel and the resource
-requirements of doing an update, lower severity 2.6.18 and 2.6.24
-updates will typically release in a staggered or "leap-frog" fashion.
-
 The following matrix lists additional source packages that were rebuilt for
 compatability with or to take advantage of this update: