Revision bump, including Linux 2.6.21.3 (fixing CVE-2007-2451). Updating the grsecurity patch to 2.1.10-2.6.21.1-200705221918.

Package-Manager: portage-2.1.2.7

7 files changed, 38 insertions, 66 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 7009773db665..5efd81086924 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,13 +1,21 @@
 # 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.153 2007/05/26 20:05:15 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.154 2007/05/26 20:30:01 phreak Exp $
+
+*hardened-sources-2.6.21-r2 (26 May 2007)
+
+  26 May 2007; Christian Heim <phreak@gentoo.org>
+  -hardened-sources-2.6.21.ebuild, -hardened-sources-2.6.21-r1.ebuild,
+  +hardened-sources-2.6.21-r2.ebuild:
+  Revision bump, including Linux 2.6.21.3 (fixing CVE-2007-2451). Updating the
+  grsecurity patch to 2.1.10-2.6.21.1-200705221918.
 
 *hardened-sources-2.6.20-r4 (26 May 2007)
 
   26 May 2007; Christian Heim <phreak@gentoo.org>
   -hardened-sources-2.6.20-r3.ebuild, +hardened-sources-2.6.20-r4.ebuild:
   Revision bump, including Linux 2.6.20.12 (which in fact fixed some security
-  bugs). Possible candidate for stable marking.
+  bugs, at the very least CVE-2007-2451). Possible candidate for stable marking.
 
   15 May 2007; Christian Heim <phreak@gentoo.org>
   hardened-sources-2.6.20-r3.ebuild:
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index d8aee2627d3f..ed6dd1530245 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -10,7 +10,7 @@ DIST genpatches-2.6.19-7.base.tar.bz2 53619 RMD160 6281b30ef2d7805555fecd1566d91
 DIST genpatches-2.6.20-11.base.tar.bz2 102433 RMD160 9c3635c6b6aec795273489c8390b95c6b984f507 SHA1 3a0ce5e589c851332430b8ede58cc62e80ab79a6 SHA256 000a3a7b6e9c03a97b4e6c8f5eaa9f03abfc00d3a457e1221139e73aba97d238
 DIST genpatches-2.6.20-5.base.tar.bz2 57009 RMD160 d9bfb4201547c978ad722eb86f146ec02cc81cb1 SHA1 ad9a8491241ced87b915a2b8c7dc973a860022b5 SHA256 3fbf02c8f6345017e756c9bf037e99f54be2af7813d7753b4b6075b4f810cd09
 DIST genpatches-2.6.20-9.base.tar.bz2 89614 RMD160 8b42914673448329fb9215d94d75ac26ca951867 SHA1 4dca31331d703b0ef1a3a6393a23971d7fc9c8b9 SHA256 76c4c73af170024f95d0045ea4b08b86db9b9d73bb1d096b93fdc2bb5eedaad9
-DIST genpatches-2.6.21-1.base.tar.bz2 1050 RMD160 da561dd019aea7c4b4b33e1afce1004ba93f504f SHA1 77014980bd7eb23e98ac6ceea69b798f8ad76aa1 SHA256 4d9d263d4c3916a68526a7b6ec4208afce071aaf541aa884f5bd78e0654e063a
+DIST genpatches-2.6.21-4.base.tar.bz2 59921 RMD160 653f77ebae9433497344ee2908158d7e4c9809bf SHA1 85893fcd470553e8b8cc955fd8e4521e17d34fb8 SHA256 ed8a8954faff48523b33ec618566cde0dcc4051f78e530785a867158aa39cf5d
 DIST hardened-patches-2.4-32.6.tar.bz2 759140 RMD160 4c01a6507315cb62dc83fe38f7b2739c58f4a4aa SHA1 33043a3674a8598768c394762e341212c2888a5c SHA256 f3fcc2b3002df05fae2d860e60040243c9f36c02b7b03b688c7caeb6802f9e8e
 DIST hardened-patches-2.4-32.7.tar.bz2 758398 RMD160 8c69130297e3bbfbe3e45e814f43c5bef4be3734 SHA1 1aed5b71c8e47b9ae8e96c08c1d1a6c3b443db4a SHA256 688c3e7ab49c943ba7452c8b4bb6c91440da4ede41f76e4576df990e6736335c
 DIST hardened-patches-2.6.14-6.extras.tar.bz2 160772 RMD160 16860d59406aa9adb8622c567df874429a999366 SHA1 3ae0ecbd5aaf33545895fa6eaceb9a0f6fae0cfd SHA256 00b80b878cdddf2681202fda4d8dc8178d3938cdfb08e2f2b28ba9a0daa7f888
@@ -23,8 +23,7 @@ DIST hardened-patches-2.6.20-1.extras.tar.bz2 214197 RMD160 7851a618b43deb8e4925
 DIST hardened-patches-2.6.20-2.extras.tar.bz2 214435 RMD160 9b3033732fad0456115f5b765b4015a1168dc551 SHA1 b6ad3f3d4a65266bca6224ad60061919a542ddab SHA256 a49de75d0b40cdc16cb47d878ac1971526ed645fc125c05597e28ce5ddb0cb6e
 DIST hardened-patches-2.6.20-4.extras.tar.bz2 211785 RMD160 f79b3bd92c75d061664e8d52a50f925499c1a522 SHA1 16034cd8b5f3611c9b9b40212ee849bfbc9823b2 SHA256 247925a32e5ebebe91ea40d18bf33eae8efd151e1672d2000988339864ca6e3b
 DIST hardened-patches-2.6.20-5.extras.tar.bz2 211895 RMD160 8a0776259ab5bc0da76b69a32b727a8168817ae0 SHA1 685f6a3ef343764599dfd4bb6e2fb539d5e32855 SHA256 522e0c0db672a0f6287d294b6811396c3d55af710719aae0dacf4d940226835c
-DIST hardened-patches-2.6.21-2.extras.tar.bz2 210779 RMD160 6ec5a8adfed4359b2cc75911af25a90e7af11916 SHA1 daa88e3e0b8136ed037a9e404b7dbf44d0a6bb65 SHA256 54468c2d0cc82e1e38ce7b9794f069c0439dcbf359ad9ab88cf071af6d439756
-DIST hardened-patches-2.6.21-3.extras.tar.bz2 207437 RMD160 739c7388724dd0bfbf17e7ab532304b7cdf97b0f SHA1 a95ddfe4b73d5484f50971635530269221fb1f35 SHA256 2fb0db4467a936cccf64b57a6808f804d5bcb7113460755c892318f7562d21d4
+DIST hardened-patches-2.6.21-4.extras.tar.bz2 210886 RMD160 685fff9f3573ba134c62cf494fdfbde4017d38da SHA1 419bb73ff528a3f3ac38b6f4b655f74d10384ab1 SHA256 c791710e054c8f675604d63d521844200fbef81886be20eec20d50a7dee20104
 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
 DIST linux-2.4.32.tar.bz2 31132159 RMD160 63ab1a0b18e690170f60de9da7392416311dc609 SHA1 0a99d7ab1d2799168d11689b4a2410b045592cf4 SHA256 7dace89c3f0850c3d5c32c38c20b600259c314e8cbec29fe3ee59c2fbbee1759
@@ -94,18 +93,14 @@ EBUILD hardened-sources-2.6.20.ebuild 756 RMD160 d8c3b6a89f0c8ec4265b5245e3f1c75
 MD5 ef2d5438189f2347d73900c2fee208ae hardened-sources-2.6.20.ebuild 756
 RMD160 d8c3b6a89f0c8ec4265b5245e3f1c7582e0a7272 hardened-sources-2.6.20.ebuild 756
 SHA256 4f461d615992a5ad8443c4d832b924c27587f2604b0e9101ad1f455ad6c5a339 hardened-sources-2.6.20.ebuild 756
-EBUILD hardened-sources-2.6.21-r1.ebuild 765 RMD160 ed3aad0cc5d0e28c85b7365d0ef7acb307a2e099 SHA1 3d7c77cbd97a35ec04b49dcf4d7ab315371b7e54 SHA256 55c91087eb157984249a5d3fe0d36a645d8aa4e0b7f01581787349013629e1b3
-MD5 b8b9bafcc16e309d1bd6bb339036a3d6 hardened-sources-2.6.21-r1.ebuild 765
-RMD160 ed3aad0cc5d0e28c85b7365d0ef7acb307a2e099 hardened-sources-2.6.21-r1.ebuild 765
-SHA256 55c91087eb157984249a5d3fe0d36a645d8aa4e0b7f01581787349013629e1b3 hardened-sources-2.6.21-r1.ebuild 765
-EBUILD hardened-sources-2.6.21.ebuild 762 RMD160 1b5b838c1ddb8de09a52c6b6d6f474c087b818eb SHA1 52cfbf464cd275856de126ebc1c744f130bbfe42 SHA256 86843eed2d5aa7a96dddc4cf2fa291ef4b0b905943b8b5ed954d96e2a789c150
-MD5 71b39b4d0079241597f06375baf4da4d hardened-sources-2.6.21.ebuild 762
-RMD160 1b5b838c1ddb8de09a52c6b6d6f474c087b818eb hardened-sources-2.6.21.ebuild 762
-SHA256 86843eed2d5aa7a96dddc4cf2fa291ef4b0b905943b8b5ed954d96e2a789c150 hardened-sources-2.6.21.ebuild 762
-MISC ChangeLog 35261 RMD160 b6d4eb8e5600741681395ea2f09df0a1dffdbe8b SHA1 ff2e590345711b2e59a7ca193953ea16033325ba SHA256 def68fc620befbc969c4abeb891d705ab693524b0264dae21f67e72147408a95
-MD5 dc7b1b051e56a53079150d7d6fd9e259 ChangeLog 35261
-RMD160 b6d4eb8e5600741681395ea2f09df0a1dffdbe8b ChangeLog 35261
-SHA256 def68fc620befbc969c4abeb891d705ab693524b0264dae21f67e72147408a95 ChangeLog 35261
+EBUILD hardened-sources-2.6.21-r2.ebuild 765 RMD160 b34ab558c92f30ee7f81839ad9346e5663ce8b80 SHA1 a39a01009247bcf221efcb1b9bcbca305567471f SHA256 00c9733d9b63342dfc7cfdaf83ad0032ab515062ec911d71bfc686b5d3dfe770
+MD5 2091155ae013d504e2a02c0697ad26a6 hardened-sources-2.6.21-r2.ebuild 765
+RMD160 b34ab558c92f30ee7f81839ad9346e5663ce8b80 hardened-sources-2.6.21-r2.ebuild 765
+SHA256 00c9733d9b63342dfc7cfdaf83ad0032ab515062ec911d71bfc686b5d3dfe770 hardened-sources-2.6.21-r2.ebuild 765
+MISC ChangeLog 35628 RMD160 ca2e2301a136c659fc2340b7e958228afbac3996 SHA1 ab602fc7f416d0e499ac0f7ca9525668cd872acf SHA256 a64ac6a5dd2e3a6b455641c103223dbe4471f35a1cf80237df7da068c8a7ead2
+MD5 277552c4a8a7d75bdf5d912dd43fd0cf ChangeLog 35628
+RMD160 ca2e2301a136c659fc2340b7e958228afbac3996 ChangeLog 35628
+SHA256 a64ac6a5dd2e3a6b455641c103223dbe4471f35a1cf80237df7da068c8a7ead2 ChangeLog 35628
 MISC metadata.xml 1051 RMD160 87063da38d351009757ee17e32bd7c44c7834ac7 SHA1 77bf9f392887db23935c77542703c70f151645e8 SHA256 37bdb62d3d2bc86816194eff6c13d8b99a8e24c9f420c2a28c454ec82f239509
 MD5 34b75fa2c02328599d2046eac10fbaa9 metadata.xml 1051
 RMD160 87063da38d351009757ee17e32bd7c44c7834ac7 metadata.xml 1051
@@ -152,16 +147,13 @@ SHA256 6ea27600379e328384fa881ebe199f869be291e87be17e619904bd670f9a134a files/di
 MD5 597fcaa34af3ac3526a9979047c66c3a files/digest-hardened-sources-2.6.20-r4 828
 RMD160 0908138f4a37666eeae7625062a4a766292d22af files/digest-hardened-sources-2.6.20-r4 828
 SHA256 e152d2cf869cc6ef1826f3acb4e4e9e7bf2aa5e6bd41955196cde85502c4729b files/digest-hardened-sources-2.6.20-r4 828
-MD5 be75bb61856fae60f5a62b669cd1d630 files/digest-hardened-sources-2.6.21 819
-RMD160 65390aff66b32db0231a08beea37ed86af55b4c0 files/digest-hardened-sources-2.6.21 819
-SHA256 8e03c292b6527a89678e775121acfa36ed00c8a181c6ac93d139876b3edf4914 files/digest-hardened-sources-2.6.21 819
-MD5 6d59b12302c180928c62182b036f8818 files/digest-hardened-sources-2.6.21-r1 819
-RMD160 1c56bef37218e8290be88e4ee03920b7617c05c4 files/digest-hardened-sources-2.6.21-r1 819
-SHA256 377554d941526e09fd755f4df9b1115a8cc5b0618455805c005e5e43bb052e87 files/digest-hardened-sources-2.6.21-r1 819
+MD5 26147152a016cf1aec9624b34ebe105b files/digest-hardened-sources-2.6.21-r2 822
+RMD160 0eff324e999532d147e40de3013b8aed1b7247b0 files/digest-hardened-sources-2.6.21-r2 822
+SHA256 034762c00b4b4d70679d707ea6abbc290047cc63e341b166044f061805307cbe files/digest-hardened-sources-2.6.21-r2 822
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWJMgyuNVb5qfaOYRAse6AJ46mD8Xrwfb23d41s4tvBS++vKrfgCgl8Tq
-cfA46xFAuvb3llNR4KcLeP4=
-=N2Iw
+iD8DBQFGWJjryuNVb5qfaOYRAvdkAJ41jrOgy1SSYDdNg1XQwesZHkg5EwCfTiEj
+IX4lSyYb311u7fzeojPByVY=
+=higd
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21
deleted file mode 100644
index 8cc0721c0d4e..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5831fd3adc21152fbd8dcebe12f2e52f genpatches-2.6.21-1.base.tar.bz2 1050
-RMD160 da561dd019aea7c4b4b33e1afce1004ba93f504f genpatches-2.6.21-1.base.tar.bz2 1050
-SHA256 4d9d263d4c3916a68526a7b6ec4208afce071aaf541aa884f5bd78e0654e063a genpatches-2.6.21-1.base.tar.bz2 1050
-MD5 dc2188337f77e3e64fbd8b08b79de870 hardened-patches-2.6.21-2.extras.tar.bz2 210779
-RMD160 6ec5a8adfed4359b2cc75911af25a90e7af11916 hardened-patches-2.6.21-2.extras.tar.bz2 210779
-SHA256 54468c2d0cc82e1e38ce7b9794f069c0439dcbf359ad9ab88cf071af6d439756 hardened-patches-2.6.21-2.extras.tar.bz2 210779
-MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
-RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
-SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r1
deleted file mode 100644
index cdcd80e1d6f1..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5831fd3adc21152fbd8dcebe12f2e52f genpatches-2.6.21-1.base.tar.bz2 1050
-RMD160 da561dd019aea7c4b4b33e1afce1004ba93f504f genpatches-2.6.21-1.base.tar.bz2 1050
-SHA256 4d9d263d4c3916a68526a7b6ec4208afce071aaf541aa884f5bd78e0654e063a genpatches-2.6.21-1.base.tar.bz2 1050
-MD5 54e24d0e6d58f66f8a3b05fd0efce0fc hardened-patches-2.6.21-3.extras.tar.bz2 207437
-RMD160 739c7388724dd0bfbf17e7ab532304b7cdf97b0f hardened-patches-2.6.21-3.extras.tar.bz2 207437
-SHA256 2fb0db4467a936cccf64b57a6808f804d5bcb7113460755c892318f7562d21d4 hardened-patches-2.6.21-3.extras.tar.bz2 207437
-MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
-RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
-SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r2 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r2
new file mode 100644
index 000000000000..5a06264afe7b
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.21-r2
@@ -0,0 +1,9 @@
+MD5 8978fbd718d24cee974aac7d8a50f063 genpatches-2.6.21-4.base.tar.bz2 59921
+RMD160 653f77ebae9433497344ee2908158d7e4c9809bf genpatches-2.6.21-4.base.tar.bz2 59921
+SHA256 ed8a8954faff48523b33ec618566cde0dcc4051f78e530785a867158aa39cf5d genpatches-2.6.21-4.base.tar.bz2 59921
+MD5 2b49becb0ff3c40db35cbdcce157e417 hardened-patches-2.6.21-4.extras.tar.bz2 210886
+RMD160 685fff9f3573ba134c62cf494fdfbde4017d38da hardened-patches-2.6.21-4.extras.tar.bz2 210886
+SHA256 c791710e054c8f675604d63d521844200fbef81886be20eec20d50a7dee20104 hardened-patches-2.6.21-4.extras.tar.bz2 210886
+MD5 1b515f588078dfa7f4bab2634bd17e80 linux-2.6.21.tar.bz2 43997476
+RMD160 b2badf41c61f66b0dda059d99a57c2e2c0ea13f4 linux-2.6.21.tar.bz2 43997476
+SHA256 f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942 linux-2.6.21.tar.bz2 43997476
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.21-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.21-r2.ebuild
index 3e93bde4afe7..06f3ac4c779a 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.21-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.21-r2.ebuild
@@ -1,15 +1,15 @@
 # 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.21-r1.ebuild,v 1.1 2007/05/15 04:29:36 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.21-r2.ebuild,v 1.1 2007/05/26 20:30:01 phreak Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="4"
 
 inherit kernel-2
 detect_version
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4
 HGPV_URI="http://dev.gentoo.org/~phreak/distfiles/${PN}/hardened-patches-${HGPV}.extras.tar.bz2"
 UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
 DESCRIPTION="Hardened kernel sources ${OKV}"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.21.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.21.ebuild
deleted file mode 100644
index 75c709da9df0..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.21.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.21.ebuild,v 1.2 2007/05/06 15:58:26 phreak Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
-
-inherit kernel-2
-detect_version
-
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2
-HGPV_URI="http://dev.gentoo.org/~phreak/distfiles/${PN}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-DESCRIPTION="Hardened kernel sources ${OKV}"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"