See bugs #365871, #365915, #366281

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 9 insertions, 107 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index a66c50ad0f98..75faa65999f3 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.415 2011/05/12 19:43:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.416 2011/05/12 19:54:50 blueness Exp $
+
+  12 May 2011; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.38-r1.ebuild, -hardened-sources-2.6.38-r2.ebuild:
+  See bugs #365871, #365915, #366281
 
 *hardened-sources-2.6.38-r4 (12 May 2011)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 286f6d96ee74..7192e08e25e0 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -43,8 +43,6 @@ DIST genpatches-2.6.37-5.base.tar.bz2 144322 RMD160 fcda1a3dcf5467e6b743e0128ea5
 DIST genpatches-2.6.37-5.extras.tar.bz2 15531 RMD160 7d13a870de0db777fa776d1eb1187f0a5f3de5c2 SHA1 48fc0d22cc0579c179c3265a1da605e3854b6fec SHA256 a986ffece5f069ad7346797691030e989e73c34101a998224fc57f86b2fc4bc0
 DIST genpatches-2.6.38-2.base.tar.bz2 48753 RMD160 417ca84cb264b96957868b8c9ab30797f7c7a06f SHA1 d74abf89f6872fb8fe97a39d761aa089922becda SHA256 47f44957cc780aa44b2be8c48ea76009d03f3b90b4e9e8dcd4af128aa34f7421
 DIST genpatches-2.6.38-2.extras.tar.bz2 15668 RMD160 79642f14a75c96f029dfb6ec4f86fe82a34b5094 SHA1 adde8ec89e98f4ee0ada4bfc24d225157efec2be SHA256 ffad6a0c3015fd0fe43f512fa353e0206a4eb0d45102459180391f96d2204caa
-DIST genpatches-2.6.38-3.base.tar.bz2 80087 RMD160 17c6cab056cb064034536eecfc5dc3e49a8fb427 SHA1 6577bfdda6355f00c37bc84634fa3b15b89b1ef8 SHA256 5edfc5a96647e0fa67b3f690201761aa03e1af1aae1ad3d729123ba677f24ddf
-DIST genpatches-2.6.38-3.extras.tar.bz2 15668 RMD160 79642f14a75c96f029dfb6ec4f86fe82a34b5094 SHA1 adde8ec89e98f4ee0ada4bfc24d225157efec2be SHA256 ffad6a0c3015fd0fe43f512fa353e0206a4eb0d45102459180391f96d2204caa
 DIST genpatches-2.6.38-4.base.tar.bz2 106077 RMD160 744a5c1fcb0d7ce6e41dee42912ffcecad60c775 SHA1 410744d502d18113626e530cb9860f96c3b007a6 SHA256 a8b2e76ff14e193de26a8992837c3f9f4e2990aed6bed037dfd284ca47ecee45
 DIST genpatches-2.6.38-4.extras.tar.bz2 15668 RMD160 79642f14a75c96f029dfb6ec4f86fe82a34b5094 SHA1 adde8ec89e98f4ee0ada4bfc24d225157efec2be SHA256 ffad6a0c3015fd0fe43f512fa353e0206a4eb0d45102459180391f96d2204caa
 DIST genpatches-2.6.38-6.base.tar.bz2 133177 RMD160 fa953770cb7b8c4184fd6d41fae04bd62c5e062c SHA1 c9ea9ce93f5e3df2f2fd1ea4f4a3e1277c77e739 SHA256 2531415720ee617392027b7c325e593d915990fd27d0f140cd9930595cb91a93
@@ -69,8 +67,6 @@ DIST hardened-patches-2.6.37-6.extras.tar.bz2 365564 RMD160 f3f13a808afd983a4ed2
 DIST hardened-patches-2.6.37-7.extras.tar.bz2 366314 RMD160 f26a136f7adf4c0359dc56b3364271429b63f6fa SHA1 cfb02544251ce1905fa643797bb1d33bbeef5f1a SHA256 77e32c9c5c150924f4d116c0bafd79305c79c9202051b18e67d3831bacf193cb
 DIST hardened-patches-2.6.37-8.extras.tar.bz2 367417 RMD160 d2a3fa214047d8fd232557f5bc6383ab01132d1f SHA1 f8a39d414d63dfcaa408eed1d9f2d5ff4fd0f72e SHA256 2593fcfa4c8363bbf9ee95bd7fa1befb15ee830262664a163da58a975548682d
 DIST hardened-patches-2.6.38-1.extras.tar.bz2 361985 RMD160 addf4253596af23c86a6c5553225f405499e98e1 SHA1 99241d5d6193e59734f8956926a50b1dcbebe0e1 SHA256 36e79bb871d00acda929371d5d47df4a084150e3515ee35ae3211749536e5bac
-DIST hardened-patches-2.6.38-2.extras.tar.bz2 373525 RMD160 0e4bfcd4293ef3fbc99e1f20d6a69b5f1c78f972 SHA1 d2a5eced3191427867d3261ebfc451be5dc1bedf SHA256 f26feb8718098d91da1663d64d5b503fd18cc40da875d6a4ffa10f44a7a68e1d
-DIST hardened-patches-2.6.38-3.extras.tar.bz2 358320 RMD160 182461251f861791388519d31144247b97aa1169 SHA1 7a90111629894f75b2474f60cb99d4d91098f7bc SHA256 271c89946aae8d0bf9b7aaeb01abe1705dbd2469f1384fe9db7cf63b5866a38b
 DIST hardened-patches-2.6.38-4.extras.tar.bz2 417075 RMD160 2d30a4bf41a75d8252324f06d2ff9b555c800af6 SHA1 50c913db315e768c5634af49f99885be10a4306b SHA256 d75f20527ca2ccb8622a0c61bf3aa99e231527c25f2a64480d4499e90dc40687
 DIST hardened-patches-2.6.38-5.extras.tar.bz2 419353 RMD160 07215c6264749107d6dac4c5616a4e20a022b571 SHA1 e9ebd4cb5f583b358c89534036d266a51356d51e SHA256 783a366061945bf1d9bd42942b3a45fd13b54f34c3899674ec458fa5e25a6ea2
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
@@ -98,17 +94,15 @@ EBUILD hardened-sources-2.6.36-r9.ebuild 1709 RMD160 861d48e196f30883df2cb425c57
 EBUILD hardened-sources-2.6.37-r5.ebuild 1745 RMD160 f0ea1e51c31e018abedb1a1c68c184ea981b4844 SHA1 afbc5da2e354abc58b73cd58226c72ad81b89556 SHA256 f0eb193fcbe118d3e2e940fd9769a13cb7c1530867882c014941af5f383aaea6
 EBUILD hardened-sources-2.6.37-r6.ebuild 1745 RMD160 44c7deb0c8b51c1b360f6266bd152d3cb60045e4 SHA1 d20ca43c8ee68b01c2452dc438484442ce646354 SHA256 a71a61720a6f770eef4e28289759834bb1451855a9f6db4a91cb20b2adff23ce
 EBUILD hardened-sources-2.6.37-r7.ebuild 1743 RMD160 f7b90bc6c4dc00022faa518d8eddd10fa34d1168 SHA1 a9b3471ea12038717a8475a32d2bb674b24bc854 SHA256 dd87762b3dddf59831d7ab221e8a948980f164bcb8317b42718dc246cf9ab386
-EBUILD hardened-sources-2.6.38-r1.ebuild 1755 RMD160 07bc403ec8b082d0e967dfe54c867a207051d715 SHA1 feb59d3cffa3c1a96f72ca4f5128bb4a69840b45 SHA256 d9bb6a30aefa0ebfc6fb37bbd6abd456f2a2baa3decb1e3cce5fb1d9be5fd882
-EBUILD hardened-sources-2.6.38-r2.ebuild 1755 RMD160 a26e00c10a552e7e335888ac2d8e97c9c442cecf SHA1 829c9eae53a89ef05091912f450628ff7a67a1f7 SHA256 1edfd6c2c378fce78549239c30bcf08055fa39182cc9401ecdaec8bee17abd99
 EBUILD hardened-sources-2.6.38-r3.ebuild 1755 RMD160 7802c8deb19e838e882d31382aee3dd4e7de39c0 SHA1 63ce478b47f753e12f383f365dac32c280259c03 SHA256 efc58bfe9ee6930079ee7d1e2e237377d901d11ca460460b0ef96bc2de946794
 EBUILD hardened-sources-2.6.38-r4.ebuild 1755 RMD160 8bd6ec278008acb3e7fc81618546f0572d96b71a SHA1 2856978e6d6cd90656527daa0ac4561cc8fb5db2 SHA256 1cbb459d27da5da525c3c15e63e48e5de10aadfe1e93a8a1c313ca978c658273
 EBUILD hardened-sources-2.6.38.ebuild 1752 RMD160 23ef93da8ea2d08852a3ed14c2b5593494152b6a SHA1 5ca6768f13fbe38588315ef3dfdbb3b316d2f5f7 SHA256 6dc4d3fb9d7ce132c6052421dd7aedff8164a22b7cb715e20f78f7b4abfe0642
-MISC ChangeLog 90701 RMD160 affb9df44fc5300c12fb0a755736c9c643a8ab77 SHA1 5d6cb363f22b6033f6caefc0f750829cd164d711 SHA256 93a525de642de9f7ce0309be88523e8fb7c8fdfae3e5f09696a0b564a68c0363
+MISC ChangeLog 90868 RMD160 e6a6cc5a8113d30be68873bbb560551cc87026be SHA1 0ab11f4d67a55f413d422c3b046e657ce45aad77 SHA256 74887d4f52cfc432514642e913e901cf41c285368691a050fd479af1c38fa753
 MISC metadata.xml 578 RMD160 7ea189a37d0f863ae9c52170bb85df27d21686fb SHA1 4765c25d7770a69f7b9dda2b1accc8ff27b74ad0 SHA256 64140e091b51002a5355d8fcfd351f2f39ed63da68af3a5751fc2058d0d03813
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3MOFYACgkQl5yvQNBFVTU5ZACfcjt69AZbzSEBnAOI8vZpocK1
-cn0AniI340wlrClMcGUfbWo/I2a3QqZM
-=J7oc
+iEYEAREIAAYFAk3MOxkACgkQl5yvQNBFVTXcBgCfWFzO6oisgp7ABFJaqKBIgBja
+6dkAoJuzJOPemp5lbb0n4HUaBPn16oNH
+=KJwj
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.38-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.38-r1.ebuild
deleted file mode 100644
index dd9c6e29714f..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.38-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 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.38-r1.ebuild,v 1.1 2011/04/20 23:38:06 blueness Exp $
-
-EAPI="2"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="3"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.2.2*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	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.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.38-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.38-r2.ebuild
deleted file mode 100644
index 5855923837e0..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.38-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 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.38-r2.ebuild,v 1.1 2011/04/28 21:38:48 blueness Exp $
-
-EAPI="2"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="4"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.2.2*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization]."
-	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.32,"
-	ewarn "should review their selected grsecurity/PaX options carefully."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}