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.

(Portage version: 2.1.2.7)

6 files changed, 22 insertions, 42 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/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"