Stabilize =sys-kernel/hardened-sources-2.6.28-r9 and remove 2.6.28-r6.

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 9 insertions, 57 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index c5d0d0bf4117..6fddabd11a10 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.309 2009/05/25 04:36:12 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.310 2009/05/29 07:53:10 gengor Exp $
+
+  29 May 2009; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.28-r6.ebuild, hardened-sources-2.6.28-r9.ebuild:
+  Stable amd64/x86 and remove old.
 
 *hardened-sources-2.6.29 (25 May 2009)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 33851d3741f5..6a4f70894a17 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -11,7 +11,6 @@ DIST genpatches-2.6.29-6.extras.tar.bz2 24680 RMD160 51b986cb7efa8790ac9a5fdf88f
 DIST hardened-patches-2.6.25-14.extras.tar.bz2 261666 RMD160 d7c11888960362d5a84742c0845ac44a401e1317 SHA1 0985db3c69e182009e225d1e0382f7232f1d41d4 SHA256 77b9809f7f4cd1bfab0a297b5d69ca061cb03ba505a711d8cd7fd65f6bbe4f2a
 DIST hardened-patches-2.6.26-10.extras.tar.bz2 243023 RMD160 f4bd5b32596883abecba3ea60b6f6ac0cb261f93 SHA1 7405b28351a5a123554f7bbb90632589f5e9129b SHA256 386ed236cd500f6865253766b57bed79387382767d18f01ac62dc769af5a324d
 DIST hardened-patches-2.6.28-10.extras.tar.bz2 233317 RMD160 7ff56366f73e8a223ca4da85e580f66888f4f0da SHA1 31b6d4e358517a28424f94c7983cdd72a42072bf SHA256 93f3385acaf2149081a04cf6c98d176dbe3300d044b9001bc4cd89d303f26d8b
-DIST hardened-patches-2.6.28-7.extras.tar.bz2 219109 RMD160 f97a640770a5cbdde15af3bbb24be65bf079d83a SHA1 2a1fca37e10fac47163e844e9b13451a79ef81e1 SHA256 c794cb2b0c1b2cd235b63cc44d0608efce3026eff4b10e393a0cc4beb4c8c198
 DIST hardened-patches-2.6.28-8.extras.tar.bz2 233365 RMD160 59c52064260c87807a967b303b853936e81105c8 SHA1 0b0c5d403d56e5e6c10cf22b8adb235b581509fe SHA256 6d76a12eaef987f6b3eee9979cdc61904e34e99c7352603c330acc3c36d90561
 DIST hardened-patches-2.6.29-1.extras.tar.bz2 235849 RMD160 a97d2c41b4b229b650ba9e3609c4f8d67078e104 SHA1 d60da480b62232a1735cd7a4c95a84434f3809f3 SHA256 6709c2f0c4d614d69ee72b4e7ac7b75bfd08a0771b444702e881095ddb9aa918
 DIST linux-2.6.25.tar.bz2 48601689 RMD160 cf3ed52f888fe9df7a93abe4fdc2f598e1ba0ce4 SHA1 aa6187a1c212dd2d8bd906b023fcefdcf711f35e SHA256 108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
@@ -20,9 +19,8 @@ DIST linux-2.6.28.tar.bz2 52665364 RMD160 47e8925220e29e239f9478228fc53543c1f7b3
 DIST linux-2.6.29.tar.bz2 56579370 RMD160 e0e8c0635665ed34618b04fe1140015a4b6ff806 SHA1 0640a2f4bea3fc272541f322b74ea365ad7f2349 SHA256 58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 EBUILD hardened-sources-2.6.25-r13.ebuild 1901 RMD160 9550a19be307245b257d4cb63c70d7e8ec63336c SHA1 e1d7a176e717547e95e3380375008f2bed73e95a SHA256 f5cd06e4ca2c309f8bc6b21effc8a5d777c9f1aa6722c9174c0a96b35dce9fe6
 EBUILD hardened-sources-2.6.26-r9.ebuild 1899 RMD160 095870d39696d1c7f287f779d84f77ed1bf302b1 SHA1 e59fef8a7966dc2a8ad6249ecb6894634e0e1197 SHA256 6089e2545732e93d014f35d36b37bd26f7b7b2dce187e10a80e821f07618c4e1
-EBUILD hardened-sources-2.6.28-r6.ebuild 1898 RMD160 5eeea2ea5308bf0db4fce66f7cf036009965dfa5 SHA1 684745d31558eaf06c0cabfca16cb37f0a1b11c3 SHA256 e03b74d8707c83cdb9ad44c36992a40e535e68f4e5ae99d962d53a225e9e8ce8
 EBUILD hardened-sources-2.6.28-r7.ebuild 1984 RMD160 550a84233586f812582bab5e8732d6ba26ee190f SHA1 867f1065121b936fdc358cfe71fdeed99c729c39 SHA256 9a0d0efd68e19926d9b33461df5a21a77e51e0b6185008accf581217b7967d22
-EBUILD hardened-sources-2.6.28-r9.ebuild 1902 RMD160 19b2ac584616ee0def962476b6bda403b10c1427 SHA1 2289a639e83847efe8408714d7bf0db66148c9b7 SHA256 9c1b9fc7950066167c6909a5623e40d46c04850c5d39fc57531b220bf9440117
+EBUILD hardened-sources-2.6.28-r9.ebuild 1900 RMD160 fd108f3e42d03b8874108dad1cb88f0334ceec5f SHA1 83f08eac5864eb92585b53b80562021f7332d160 SHA256 a6b71448e042f4693bc378d824c5dbd2e5bf34644e4af28c51d65f74533e2237
 EBUILD hardened-sources-2.6.29.ebuild 1898 RMD160 af5d66ad376dd660d09089f2a011348390275e04 SHA1 f43efdaea2ff719f24e5db463231e90922e01f9e SHA256 716173129c54c8bc04a5353466656bb73a7ebd9d8fba5ebe86f0a1c17080ee1f
-MISC ChangeLog 66357 RMD160 b3a4327c83ef187d85804c9c5ffb46a925ae11bc SHA1 41ab2cc03d4e11a1cc208a8f91272a3cfc801d2f SHA256 05aa7d9a8ed1196b5b1bb62b10c29c7493bb3daed7dcc5fa153ba0d2aae51f54
+MISC ChangeLog 66513 RMD160 3133f7cbbe6e94c675c845725ab21516e72f6e57 SHA1 8271b4c486cbad46b01c27dd563616dc0f51b937 SHA256 eb2fcf29a60c45461af9195f4daa6b31e007cbf56a459a17e1f83896861adc6b
 MISC metadata.xml 541 RMD160 c1aeb8ba5490432cbb1ddd97bb83a38988e0906e SHA1 5c2615e7e4074cac951e491ead158bb4cbb637b9 SHA256 89a1257a0cfe45645ebe83f878abbf88e32bc25344967346833e4b651797acc2
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild
deleted file mode 100644
index 6d053f31b95f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 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.28-r6.ebuild,v 1.4 2009/05/01 23:52:38 gengor Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="7"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-7"
-HGPV_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.5.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE=""
-
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.1.13*"
-
-	ewarn
-	ewarn "As of ${CATEGORY}/${PN}-2.6.24 the predefined"
-	ewarn "\"Hardened [Gentoo]\" grsecurity level has been removed."
-	ewarn "Two improved predefined security levels replace it:"
-	ewarn "\"Hardened Gentoo [server]\" and \"Hardened Gentoo [workstation]\""
-	ewarn
-	ewarn "Those who intend to use one of these predefined grsecurity levels"
-	ewarn "should read the help associated with the level. Users importing a"
-	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.24,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with kernel series ${OKV}."
-	ewarn "Therefore, it is strongly recommended that the following command is"
-	ewarn "issued prior to booting a ${P} series kernel for"
-	ewarn "the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
index f29244f5fbb1..470d284d2d4b 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.28-r9.ebuild,v 1.1 2009/05/25 02:31:57 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.28-r9.ebuild,v 1.2 2009/05/29 07:53:10 gengor Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -20,7 +20,7 @@ DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 pkg_postinst() {
 	kernel-2_pkg_postinst