Removed 2.6.32-r7 because its on the tree now.

Updated metadata.xml to match tree.

4 files changed, 16 insertions, 64 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index f6cbd2f..033581b 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 May 2010; Anthony G. Basile <basile@opensource.dyc.edu>
+  -hardened-sources-2.6.32-r7.ebuild, metadata.xml:
+  Removed 2.6.32-r7 because its on the tree now.
+  Updated metadata.xml to match tree.
+
 *hardened-sources-2.6.33-r3 (27 May 2010)
 
   27 May 2010; Anthony G. Basile <basile@opensource.dyc.edu>
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index f9999ef..25a4ba1 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,14 +1,8 @@
-DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
 DIST deblob-2.6.33 86599 RMD160 534eb7b76ea29561a0b6e73659f67fc746fad111 SHA1 0c3c2d8c299f3cb5d807bc4a35b20bdca50ccbce SHA256 176aa9c73f27c9c69f198e3637cae61072f152c25c468ffbebf1a4c2494d52d0
-DIST genpatches-2.6.32-11.base.tar.bz2 442656 RMD160 908f0f8fefc5c866c7f5cd52a584fee1a3f966dc SHA1 a654d665139375881cbbccfccfd73584061c6ecc SHA256 355133d73ec568b8ca2853efdafd0481987d550e865ce436cc3d0d7f57d8fe95
-DIST genpatches-2.6.32-11.extras.tar.bz2 24934 RMD160 e3e1d60fb45a3e3c818ddda36b9180d4fc46679e SHA1 d16a34dfa35d163ea4042058b3865c389f3802e9 SHA256 50b70c76461aa52f7f2ad88175e7f08eb555f7f1dfd274759ec0c2a9748bde5e
 DIST genpatches-2.6.33-3.base.tar.bz2 135726 RMD160 3e32b98bdc22141ec4262edd1735dedfd1b6e719 SHA1 4d5e95972b3afc41c1d102bf75d1b22edacc11ba SHA256 c1d29084f715c1c30fcbb64a29c8cee076cf29286cf0ad10c9df51eb136b4bb6
 DIST genpatches-2.6.33-3.extras.tar.bz2 23522 RMD160 579e83343a0f6bae8d543abf1d3a52cabd2c8aa8 SHA1 c9023272ea6805878b906affa4dedb50565343f1 SHA256 a301f823a11cbaae5b81092b60d92a9d9b53e8522167713428e74db2b4c629c1
-DIST hardened-patches-2.6.32-10.extras.tar.bz2 337509 RMD160 47ac442a37e97e6a69b4509d61695b63fe59bfbf SHA1 ee11dd47cadffefea65eb7e76ea0009ae34e2cd0 SHA256 1a2cd14f7aa21fc00cdadc39505bcd37d6665742e8f52530bb32dbdf26944034
 DIST hardened-patches-2.6.33-3.extras.tar.bz2 334588 RMD160 41678ce0733aeceb857f63fba2432faef392eb8f SHA1 2810c9b17845eef18e1f91c4a4ff0b549ea548d2 SHA256 2c73d058e83c7bf7a5f28f01797d235232846abb8b638e15ca75a0401410870a
-DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb4664 SHA1 acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6
-EBUILD hardened-sources-2.6.32-r7.ebuild 1882 RMD160 3dd8300906867352c5f1493fb4ad5707a9d502b3 SHA1 59415f3e8bf2594ca5be3ab82bc7465cf9325c0f SHA256 fb152657a136ceb6bb5ae18fde95c970c76b06af6fcfa4a18b066bc80558bb3d
 EBUILD hardened-sources-2.6.33-r3.ebuild 1880 RMD160 68433a6096400600b45ab525717ff7746b2c45ae SHA1 268380227f633e505adcc48d847e3e641b887fbc SHA256 11e9d685d4319c0f3c381f46e5399ad43cf12419af04e8d3bf315b24379cadc4
-MISC ChangeLog 819 RMD160 def6844bb8ca8e04b425f5083deacc4958b0708d SHA1 cf52882e9f21d9ad5a4bcc72ac54548d927642b5 SHA256 ea21817b9c9bb4dcb84016b49917e75d62ede86c3e2ed081af429b6bb78c6662
-MISC metadata.xml 635 RMD160 6f5f3a80e7a75b741d5328e0e3cf574ffa6354b7 SHA1 bf86f71339336c19f665fb373b0c8144fbecbc8e SHA256 072b619e2ac287d035d2452597f05a4f4a0417bd421035a4ec426a5652de3d45
+MISC ChangeLog 1020 RMD160 a142f2c37eee8d47a8a733372e31648af177220e SHA1 2c6caccfeb49f0deec200cb47361695d7b2a45e0 SHA256 35cd24aa63d4d46197c175472b220fdecf99d364ed8769b2fd4f61938cfea452
+MISC metadata.xml 770 RMD160 ce43c497d4a4a6e4633bec0bce6593ce78605865 SHA1 75da150c2e9ee9847d12a9d79ee2b88b5a63993e SHA256 1e2850c18164d38a9893f9afaf4d31cb89bd8077801378447c31c35ecce92840
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r7.ebuild
deleted file mode 100644
index 34f57a2..0000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 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.29.ebuild,v 1.1 2009/05/25 04:36:12 gengor Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-10"
-HGPV_URI="http://opensource.dyc.edu/pub/distfiles/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.6.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.14*"
-
-	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/metadata.xml b/sys-kernel/hardened-sources/metadata.xml
index 0dd3a97..ee343fa 100644
--- a/sys-kernel/hardened-sources/metadata.xml
+++ b/sys-kernel/hardened-sources/metadata.xml
@@ -4,19 +4,22 @@
 	<herd>kernel</herd>
 	<herd>hardened</herd>
 	<maintainer>
-		<email>kerframil@gmail.com</email>
-		<name>Kerin Millar</name>
+		<email>quantumsummers@gentoo.org</email>
+		<name>Matthew Summers</name>
 	</maintainer>
 	<maintainer>
-		<email>gengor@gentoo.org</email>
-		<name>Gordon Malm</name>
+		<email>robbat@gentoo.org</email>
+		<name>Robin H. Johnson</name>
 	</maintainer>
 	<maintainer>
-		<email>anarchy@gentoo.org</email>
-		<name>Jory A. Pratt</name>
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
 	</maintainer>
 	<longdescription>
 		hardened-sources is based upon genpatches, and adds the grsecurity
 		patch from http://www.grsecurity.net, which also includes PaX.
 	</longdescription>
+	<use>
+		<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+  	</use>
 </pkgmetadata>