Fixes CVE-2006-0744, CVE-2006-0744, CVE-2006-1522, CVE-2006-1242

(Portage version: 2.1_pre7-r5)

4 files changed, 22 insertions, 15 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 76259e872337..7104deea8631 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.86 2006/04/13 09:25:25 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.87 2006/04/14 18:48:29 johnm Exp $
+
+*hardened-sources-2.6.14-r7 (14 Apr 2006)
+
+  14 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r5.ebuild, +hardened-sources-2.6.14-r7.ebuild:
+  Fixes CVE-2006-0744, CVE-2006-0744, CVE-2006-1522, CVE-2006-1242
 
 *hardened-sources-2.6.16-r2 (13 Apr 2006)
 
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r5 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r5
deleted file mode 100644
index 3b5d401b6cd2..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 40fd03c7c6746aada2cb8f47d0780b6b genpatches-2.6.14-10.base.tar.bz2 68373
-RMD160 5f29f8a6005b4a51d31d8b393cadd4b1e736dca7 genpatches-2.6.14-10.base.tar.bz2 68373
-SHA256 ba3de7f463857391ef6d033fc9874f6025f3b93727c92c2e100af7f5200ced5e genpatches-2.6.14-10.base.tar.bz2 68373
-MD5 270705354df32237708fd167b239dd51 hardened-patches-2.6.14-5.extras.tar.bz2 168053
-RMD160 6a4e3b27a009c6cdea8994be85572638618d3344 hardened-patches-2.6.14-5.extras.tar.bz2 168053
-SHA256 cdcb5955367d90b50ce4062fcd29a713f39d4acd881733f6e5129c59efe204e9 hardened-patches-2.6.14-5.extras.tar.bz2 168053
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
-RMD160 7be1f20c24f703bc0e2a25e52f68137a423dec61 linux-2.6.14.tar.bz2 39172170
-SHA256 cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15 linux-2.6.14.tar.bz2 39172170
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r7 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r7
new file mode 100644
index 000000000000..f965dba70fc2
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r7
@@ -0,0 +1,9 @@
+MD5 82160e8b1c4f928cbde2fe1d180e79bc genpatches-2.6.14-13.base.tar.bz2 101369
+RMD160 2f20226bd7a6a2dda4eefa6cb80593bfaebddb8f genpatches-2.6.14-13.base.tar.bz2 101369
+SHA256 a15eb48666c21b9522b2639a3ee3e150c161ec69e70ae535ebd2e7cb9fa5a6aa genpatches-2.6.14-13.base.tar.bz2 101369
+MD5 091a6f0c1f7d913b5ed5047062081e77 hardened-patches-2.6.14-6.extras.tar.bz2 160772
+RMD160 16860d59406aa9adb8622c567df874429a999366 hardened-patches-2.6.14-6.extras.tar.bz2 160772
+SHA256 00b80b878cdddf2681202fda4d8dc8178d3938cdfb08e2f2b28ba9a0daa7f888 hardened-patches-2.6.14-6.extras.tar.bz2 160772
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+RMD160 7be1f20c24f703bc0e2a25e52f68137a423dec61 linux-2.6.14.tar.bz2 39172170
+SHA256 cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15 linux-2.6.14.tar.bz2 39172170
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.14-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.14-r7.ebuild
index 33c305d7090b..2ac878b00d97 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.14-r5.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.14-r7.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.14-r5.ebuild,v 1.2 2006/02/19 21:55:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.14-r7.ebuild,v 1.1 2006/04/14 18:48:31 johnm Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="13"
+K_EXTRAEINFO="If you are using RBAC you will need to ensure you are using at
+least gradm-2.1.8.200601212342-r1"
 
 inherit kernel-2
 detect_version
-detect_arch
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6
 HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
 UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI}"
 KEYWORDS="~alpha amd64 ppc x86"