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.

Package-Manager: portage-2.1.2.2

4 files changed, 30 insertions, 23 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/Manifest b/sys-kernel/hardened-sources/Manifest
index dfbc4f33d6e8..599fa9e53d50 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -13,7 +13,7 @@ DIST hardened-patches-2.6.14-6.extras.tar.bz2 160772 RMD160 16860d59406aa9adb862
 DIST hardened-patches-2.6.16-8.extras.tar.bz2 162755 RMD160 ea628cf693730f6bbd42ccdb148569ecf5034cc4 SHA1 2aa006d21ea6e2eb0ba9a755b6932eac4b0133cb SHA256 5cf1136dfe9abcd480310ca4c98b00f1e09ca32dd8bc20e466f943c65499d8a1
 DIST hardened-patches-2.6.17-3.extras.tar.bz2 171608 RMD160 cf1f1a4c37115899db2b732731a249bfb311bbee SHA1 368f0bf43c93e927a3a01e07283359233f2140a0 SHA256 28bde8923416cb06cac5be50d74f3d7b73bd5a8a726f8e09e404aec3b45d824f
 DIST hardened-patches-2.6.18-1.extras.tar.bz2 213695 RMD160 41c243634c7a7a9113396163c5fc6a8312fb77a5 SHA1 d5b57cde10118e2af1425af97950685a70d0193e SHA256 d975cad3deac4c5208f4c9c21a805edf288149172d00fcf6d9710eec290a5949
-DIST hardened-patches-2.6.18-5.extras.tar.bz2 184576 RMD160 66088cdd5321e4f8742e51fae99751215d4d7085 SHA1 0d864efe66d859e5c3dd92b2f80f7df472563ca5 SHA256 04e2b34f4c14fb5b72462772b26a24ae1b1a8d582013bfdf9f39cc114a31f15d
+DIST hardened-patches-2.6.18-6.extras.tar.bz2 183475 RMD160 25655cddba3e1f439ee8702c5b7d2d5cc0139560 SHA1 8c2a79a94cd389a548fb819312499ae36fbb3c43 SHA256 81f1810a14b4a8745e1c0c38dbf14a2e14da278212035900f251f924a90740d3
 DIST hardened-patches-2.6.19-7.extras.tar.bz2 189087 RMD160 d02f7653a32da5b19a27b9960373f4ce784ed997 SHA1 8021aca6cc783bc98d42496355177a29dd7c9db8 SHA256 c749381a8384ec9c31e801afa8943049f91a14bbb05d0a938409ae278bd75f7a
 DIST hardened-sources-2.4.33.4-patches.tar.bz2 255049 RMD160 3e38e6fee8199662ce97fbd278aaa7e17a26f691 SHA1 9d52ae42a9e60541935c9e86455ce96396567eff SHA256 0c6f6c672e051b2ab30eedac2e3f89e3e2701e474dbdbad0dca301186060743c
 DIST hardened-sources-2.4.34-patches.tar.bz2 254059 RMD160 3b995b47ad0ebb42a63938dd038a405314405eec SHA1 6eb2f6b7da178a5a0c1c04bdad4bbe063e182217 SHA256 ff49c4faa28f0bec91e1f149adf1a64b171327a3bff60205433d1e1391c7014b
@@ -54,10 +54,10 @@ EBUILD hardened-sources-2.6.17-r1.ebuild 727 RMD160 300c7b5f958ac7f65f39599b9e3c
 MD5 433461dcd2d1a6245fec4596b293e5c3 hardened-sources-2.6.17-r1.ebuild 727
 RMD160 300c7b5f958ac7f65f39599b9e3cffbce308cadc hardened-sources-2.6.17-r1.ebuild 727
 SHA256 f380f7dc4493f14cb2a38b04a39ef80181d3c3962de799b2a35694aada1d3a76 hardened-sources-2.6.17-r1.ebuild 727
-EBUILD hardened-sources-2.6.18-r5.ebuild 826 RMD160 3c79918dc7459eb137ac6b913a8b268b8033e842 SHA1 4fc45d05e42a2cc6d543e453d6c6271de246afa8 SHA256 5d7a61ee89d77409f029d177b79dd53d8f3dbc9294dc9147ad3ecc03c56c8444
-MD5 259754bf798670642845492b52cbaaeb hardened-sources-2.6.18-r5.ebuild 826
-RMD160 3c79918dc7459eb137ac6b913a8b268b8033e842 hardened-sources-2.6.18-r5.ebuild 826
-SHA256 5d7a61ee89d77409f029d177b79dd53d8f3dbc9294dc9147ad3ecc03c56c8444 hardened-sources-2.6.18-r5.ebuild 826
+EBUILD hardened-sources-2.6.18-r6.ebuild 760 RMD160 2c287794686aa19fad905a4340b48539e6a63f55 SHA1 be23c935a336702338cf06de09c11c652d84944f SHA256 3d55008ed00e18158100b9c5111183c61b8b5a6c0bea17cffff87df22ad5852c
+MD5 7314f4e12562d31bc64aa3c04ebd86cf hardened-sources-2.6.18-r6.ebuild 760
+RMD160 2c287794686aa19fad905a4340b48539e6a63f55 hardened-sources-2.6.18-r6.ebuild 760
+SHA256 3d55008ed00e18158100b9c5111183c61b8b5a6c0bea17cffff87df22ad5852c hardened-sources-2.6.18-r6.ebuild 760
 EBUILD hardened-sources-2.6.18.ebuild 723 RMD160 cd7b35e9f920630d421b6178a5f632f64e040da3 SHA1 18da07061273d763b41cb7c52aa0cda27b7ae4a6 SHA256 1ee905d41f9d1934df609eae573ddfb78d21cbbe05b2c2bf4c9776087a390add
 MD5 1ddefcce182875388fd5236570b3c06b hardened-sources-2.6.18.ebuild 723
 RMD160 cd7b35e9f920630d421b6178a5f632f64e040da3 hardened-sources-2.6.18.ebuild 723
@@ -66,10 +66,10 @@ EBUILD hardened-sources-2.6.19-r6.ebuild 759 RMD160 2c5e8d132245d6be863c5c687233
 MD5 b483b792537f2d16e1911f362a124840 hardened-sources-2.6.19-r6.ebuild 759
 RMD160 2c5e8d132245d6be863c5c6872333f861a8e5a50 hardened-sources-2.6.19-r6.ebuild 759
 SHA256 fc3327cb8b630e7e182193405e88e738e4c11b0ed0b72ec79131e9905091832c hardened-sources-2.6.19-r6.ebuild 759
-MISC ChangeLog 32191 RMD160 061bc69370266790de137124f36eadc523901550 SHA1 23283bbc6bbb14e787ef81798e3b35eefa4a0d6f SHA256 90d23aa85c95128a2b07a339911fb8a1df6542d3806475582f07e149cffbc6f4
-MD5 dda857d6027b820307d2d07c1da98f1b ChangeLog 32191
-RMD160 061bc69370266790de137124f36eadc523901550 ChangeLog 32191
-SHA256 90d23aa85c95128a2b07a339911fb8a1df6542d3806475582f07e149cffbc6f4 ChangeLog 32191
+MISC ChangeLog 32525 RMD160 85319461e3e24d9404233221b18def8fc084bd78 SHA1 712554a1ee273e5cb7d27262d9485d741be2112a SHA256 bc7b81b26f1ad4394393efcd54cfde0d392c9e29eaa0d51b056e55cf0f96b7ee
+MD5 c98b6929bd94b3c32356d1e29969f31d ChangeLog 32525
+RMD160 85319461e3e24d9404233221b18def8fc084bd78 ChangeLog 32525
+SHA256 bc7b81b26f1ad4394393efcd54cfde0d392c9e29eaa0d51b056e55cf0f96b7ee ChangeLog 32525
 MISC metadata.xml 1051 RMD160 87063da38d351009757ee17e32bd7c44c7834ac7 SHA1 77bf9f392887db23935c77542703c70f151645e8 SHA256 37bdb62d3d2bc86816194eff6c13d8b99a8e24c9f420c2a28c454ec82f239509
 MD5 34b75fa2c02328599d2046eac10fbaa9 metadata.xml 1051
 RMD160 87063da38d351009757ee17e32bd7c44c7834ac7 metadata.xml 1051
@@ -98,16 +98,16 @@ SHA256 704c47701789ca4043581ea22c75359f9670ea44ffe7368d7b560c42e3220822 files/di
 MD5 608c0aca5b237d17d4f9f32366d8aaa0 files/digest-hardened-sources-2.6.18 822
 RMD160 52989e7235dfcb8471a08543a9661f7bebdfe31f files/digest-hardened-sources-2.6.18 822
 SHA256 252ac58ea90d66edff3164bc24cbb5e3bcf442b406ec17d27f5af51eecf5dd58 files/digest-hardened-sources-2.6.18 822
-MD5 0e50d890dd27320ed083a2a7b906c860 files/digest-hardened-sources-2.6.18-r5 828
-RMD160 1fdf7debb8f4cb5a3951ab023636f88cdacc2f60 files/digest-hardened-sources-2.6.18-r5 828
-SHA256 f5b27022b134ff08ecc314187fb5ecb51240f95c4d3fd1878c8122ca0dd30d33 files/digest-hardened-sources-2.6.18-r5 828
+MD5 fbc0f120604ae6ff243835994675d1a9 files/digest-hardened-sources-2.6.18-r6 828
+RMD160 69271911c9f5c6120775dfbc4b7ce1cbee443e13 files/digest-hardened-sources-2.6.18-r6 828
+SHA256 ad0cd4d623b42ebcb9358c5eb56cfdd8bf24464fdd566ba0dfdb04461c607542 files/digest-hardened-sources-2.6.18-r6 828
 MD5 bd4f15ba848cc9d8aca25387260f666e files/digest-hardened-sources-2.6.19-r6 822
 RMD160 22b2410075e5cc60eb33e33d6f64e0b549523b85 files/digest-hardened-sources-2.6.19-r6 822
 SHA256 56bb006d2cccc65136611b4aec8a8dd36fed25b03aadeda6d452dd3e02d7b57f files/digest-hardened-sources-2.6.19-r6 822
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7U28yuNVb5qfaOYRAovYAKCJfI1WzPZDH7HeYg43Zc86rkGLrgCfTo0R
-bGXmUjrGzQFFM+HmU9G01u0=
-=Vh+B
+iD8DBQFF+qCkyuNVb5qfaOYRAk0OAJ4gpVR8r0hq00dDbOX26buiAgY/JgCgzjXN
+AuAepDq+MXYBxwOxpWL9n0Y=
+=3E2W
 -----END PGP SIGNATURE-----
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/"