2.6.16-r2 release.

(Portage version: 2.1_pre7-r5)

6 files changed, 21 insertions, 40 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 6074bf667373..76259e872337 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.85 2006/04/11 13:49:50 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.86 2006/04/13 09:25:25 johnm Exp $
+
+*hardened-sources-2.6.16-r2 (13 Apr 2006)
+
+  13 Apr 2006; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.16.ebuild, -hardened-sources-2.6.16-r1.ebuild,
+  +hardened-sources-2.6.16-r2.ebuild:
+  Removing vulnerable 2.6.16 kernels. Bumping grsec, re-enabling reiserfs sec
+  labels, dropping USERGROUP define fixes, since these were merged mainstream.
 
 *hardened-sources-2.6.16-r1 (11 Apr 2006)
 
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16
deleted file mode 100644
index 2304d04b61b7..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a6d31980787688532a44fc5fecc32615 genpatches-2.6.16-2.base.tar.bz2 24704
-RMD160 e2949257cedae05b21726d81562a0759f916503e genpatches-2.6.16-2.base.tar.bz2 24704
-SHA256 17d49ca372437d1b0e1a419e6dc34ea5f13c1dd72023021824685c1eca4b69d3 genpatches-2.6.16-2.base.tar.bz2 24704
-MD5 fd416d26882043557423fa6df05cd81f hardened-patches-2.6.16-1.extras.tar.bz2 161910
-RMD160 8e79dfa379c110599c1cccd32555f1164ab477a9 hardened-patches-2.6.16-1.extras.tar.bz2 161910
-SHA256 f6ea621f36d506390d3b29faaae1b7208072a8381fdee4ad85779d804a0499f9 hardened-patches-2.6.16-1.extras.tar.bz2 161910
-MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
-RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
-SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r1
deleted file mode 100644
index 7901fa7b1cea..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 1c51f3182e1a44d611760f1b8cfbb30e genpatches-2.6.16-3.base.tar.bz2 31202
-RMD160 b55cb1973e0727657ebb4422423c29fa0b90b230 genpatches-2.6.16-3.base.tar.bz2 31202
-SHA256 424f353a23e66c883b53f0a73658e45bd907cc2ead33fc06163f0a37389a86a9 genpatches-2.6.16-3.base.tar.bz2 31202
-MD5 fd416d26882043557423fa6df05cd81f hardened-patches-2.6.16-1.extras.tar.bz2 161910
-RMD160 8e79dfa379c110599c1cccd32555f1164ab477a9 hardened-patches-2.6.16-1.extras.tar.bz2 161910
-SHA256 f6ea621f36d506390d3b29faaae1b7208072a8381fdee4ad85779d804a0499f9 hardened-patches-2.6.16-1.extras.tar.bz2 161910
-MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
-RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
-SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r2 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r2
new file mode 100644
index 000000000000..a7c987937792
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.16-r2
@@ -0,0 +1,9 @@
+MD5 41d52bcbc7daee8ee71b980e9ea32e81 genpatches-2.6.16-4.base.tar.bz2 33194
+RMD160 f22b63fb703a1b2d9e8445bea9b369d0f9105e19 genpatches-2.6.16-4.base.tar.bz2 33194
+SHA256 b702010e3ede2bdcbda66ada55b4403a49c08f99a80b174ed68b5eb255eb61b3 genpatches-2.6.16-4.base.tar.bz2 33194
+MD5 3c6b51aa2b16213402daa0565c238314 hardened-patches-2.6.16-2.extras.tar.bz2 161248
+RMD160 d54be412c972ca84c579dec0eebfe921c4717136 hardened-patches-2.6.16-2.extras.tar.bz2 161248
+SHA256 c8a0754159406cda836e0f8cc454d9aaa2a2ac43b3988eb27a34d416d93ce9c0 hardened-patches-2.6.16-2.extras.tar.bz2 161248
+MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
+RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
+SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.16-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.16-r2.ebuild
index 04d20adf4a3b..8cb54d713543 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.16-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.16-r2.ebuild
@@ -1,15 +1,15 @@
 # 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.16-r1.ebuild,v 1.1 2006/04/11 13:49:50 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.16-r2.ebuild,v 1.1 2006/04/13 09:25:25 johnm Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="3"
+K_GENPATCHES_VER="4"
 
 inherit kernel-2
 detect_version
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2
 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"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.16.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.16.ebuild
deleted file mode 100644
index 6ddfe25a6baa..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.16.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.16.ebuild,v 1.2 2006/04/02 00:24:37 johnm Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="2"
-
-inherit kernel-2
-detect_version
-
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1
-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}"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"