Fixing CVE-2007-1000 locally (hardened/), thanks to Tony for pushing. And yes I screwed up, this is tagged as 2.6.18-5 and not 2.6.18-6 as it's supposed to be.

(Portage version: 2.1.2.2)

3 files changed, 14 insertions, 7 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index f7795c6d2df2..949f9d52eae2 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.139 2007/03/06 11:16:45 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.140 2007/03/16 13:49:58 phreak Exp $
+
+*hardened-sources-2.6.18-r6 (16 Mar 2007)
+
+  16 Mar 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.18-r5.ebuild, +hardened-sources-2.6.18-r6.ebuild:
+  Fixing CVE-2007-1000 locally (hardened/), thanks to Tony for pushing. And
+  yes I screwed up, this is tagged as 2.6.18-5 and not 2.6.18-6 as it's
+  supposed to be.
 
   06 Mar 2007; Christian Heim <phreak@gentoo.org> ChangeLog:
   Fixing the Manifest, the previous one was broken (as in still had the
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.18-r5 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.18-r6
index 61c4736678e0..ffab1fc1e006 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.18-r5
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.18-r6
@@ -1,9 +1,9 @@
 MD5 7e3eaba91aa76d2b88ed7bb20f64d4c9 genpatches-2.6.18-10.base.tar.bz2 113483
 RMD160 9f19f7147c50650369afddec946b281aff817a48 genpatches-2.6.18-10.base.tar.bz2 113483
 SHA256 2d72cbe1e238318438a6ee9375a0ed42432a95c4d6fccb5afb14f8655a4a15b2 genpatches-2.6.18-10.base.tar.bz2 113483
-MD5 9884042f243be3c56f867445070201df hardened-patches-2.6.18-5.extras.tar.bz2 184576
-RMD160 66088cdd5321e4f8742e51fae99751215d4d7085 hardened-patches-2.6.18-5.extras.tar.bz2 184576
-SHA256 04e2b34f4c14fb5b72462772b26a24ae1b1a8d582013bfdf9f39cc114a31f15d hardened-patches-2.6.18-5.extras.tar.bz2 184576
+MD5 742368e419c6a2bc9a79694a562badde hardened-patches-2.6.18-6.extras.tar.bz2 183475
+RMD160 25655cddba3e1f439ee8702c5b7d2d5cc0139560 hardened-patches-2.6.18-6.extras.tar.bz2 183475
+SHA256 81f1810a14b4a8745e1c0c38dbf14a2e14da278212035900f251f924a90740d3 hardened-patches-2.6.18-6.extras.tar.bz2 183475
 MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.18-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.18-r6.ebuild
index 2fbb766cefb2..c84e17cf5f0b 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.18-r5.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.18-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.18-r5.ebuild,v 1.1 2007/03/06 10:35:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.18-r6.ebuild,v 1.1 2007/03/16 13:49:58 phreak Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
@@ -9,10 +9,9 @@ K_GENPATCHES_VER="10"
 inherit kernel-2
 detect_version
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6
 HGPV_URI="http://dev.gentoo.org/~phreak/distfiles/${PN}/hardened-patches-${HGPV}.extras.tar.bz2"
 UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4454_grsec-2.1.9-2.6.18.2-io-kmem-sysctl.patch"
 DESCRIPTION="Hardened kernel sources ${OKV}"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"