Fixes bug #328275

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

3 files changed, 19 insertions, 27 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 18f32412a02c..f35ccf18c54e 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.326 2010/07/21 12:47:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.327 2010/07/24 11:21:02 blueness Exp $
+
+*hardened-sources-2.6.34-r1 (24 Jul 2010)
+
+  24 Jul 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.34.ebuild, +hardened-sources-2.6.34-r1.ebuild:
+  Fixes bug #328275
 
   21 Jul 2010; <chainsaw@gentoo.org> metadata.xml:
   Address metadata concerns by Jeroen "rej" Roovers <rej@gentoo.org> raised
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 5b8f8a3912eb..eeff3a855a23 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST deblob-2.6.28 72502 RMD160 a3f0a12e0c6312dfc7cacd0e81a50e57519b8df3 SHA1 5a7fb26f3c0c9855bb85431fa29fc285a19f7346 SHA256 432213f8caf6dc534a68dfb321dd33177f93c2fbdd57928a61e49947dd49f25c
 DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
 DIST deblob-2.6.34 88276 RMD160 12f83200b74a9d859b7241b1e8d8c0250d8bcb90 SHA1 985bd73ebca8e720f92eb01d11c22e25d21865b6 SHA256 9478ada7a36f3858ef9ba3dc5c9609fb45fa9b286a002ccfba09045c81b217ed
@@ -16,7 +13,7 @@ DIST hardened-patches-2.6.28-10.extras.tar.bz2 233317 RMD160 7ff56366f73e8a223ca
 DIST hardened-patches-2.6.32-12.extras.tar.bz2 338946 RMD160 ce283b495ee2f009d36b94aca840f6519fbe9bb6 SHA1 56da715d64c6e2c50e292b19d27006d82118a337 SHA256 bfa5e7d9653b793b2bd88c40b8b52464fe39e1e098f1c5bc95d8476247fd288f
 DIST hardened-patches-2.6.32-13.extras.tar.bz2 340034 RMD160 0b265f033058b864333798b73d9b1cf5d939d323 SHA1 a1fdf7b83045a3d9562a00c5f56e7aad8d74d46a SHA256 28b08cbc5feffa693dbf0ff3ced8a6e0ab9b68d439ab9bcf8da19e1eaefd19c7
 DIST hardened-patches-2.6.32-14.extras.tar.bz2 335884 RMD160 440a17e9a33c31443e5d431e14b4deb30ec91d43 SHA1 3c5ea3bae09dfd73b37d3474c0a14083f6258d14 SHA256 a8db3eb5e4946449740bd8431bff03f89fe7815243c4de7516c97970d6c309ef
-DIST hardened-patches-2.6.34-1.extras.tar.bz2 326178 RMD160 ffe3745614d01ced1cd88b2e694259e583135933 SHA1 5b7f6db85c84f2715ba04a8ec9a4a761a0714892 SHA256 f977b5781108bbb04d27d6877783bac4fc554b7d6d7a67835fc22bb786b225d9
+DIST hardened-patches-2.6.34-2.extras.tar.bz2 328865 RMD160 dee1323923a2602eaa2a72dd71f9e20b8748760f SHA1 59c14973c76b28427ea9ba0b09908354637e07b2 SHA256 0e21c251f8ac097b5e27d154834f895d83ebcf71af62cba47d7781a3a5cdfe67
 DIST linux-2.6.28.tar.bz2 52665364 RMD160 47e8925220e29e239f9478228fc53543c1f7b300 SHA1 4f40f8bf3fd110b0cc6e1fea5f539c98f9959e94 SHA256 ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
@@ -24,13 +21,6 @@ EBUILD hardened-sources-2.6.28-r9.ebuild 1899 RMD160 ec8912b43989f91c8818d72f0ae
 EBUILD hardened-sources-2.6.32-r10.ebuild 1863 RMD160 85f01e3cd9d063c7aad03cf01cef70f84db05af9 SHA1 ad778aa07626bf2a5c351e18b49fcf40f910351d SHA256 9007f42667c37371c8d42670b7ebd7002949456a058abee2ff1791252a101f87
 EBUILD hardened-sources-2.6.32-r11.ebuild 1863 RMD160 a4c0ce08e1b76ae3508dd1c2d6c372a3577b9d87 SHA1 322ceeefc5cc655bb469ded5c27a1f9e07602315 SHA256 9c7ae57f1ae8cf8eda45e06e875e3cdc3e4623c86710eec58ad44733004e5721
 EBUILD hardened-sources-2.6.32-r9.ebuild 1858 RMD160 e2d805478163060691213fd3f0c98c244bd5fdf8 SHA1 b4c5ec1c1af11a34aafadb39e3b437580dec986f SHA256 942fdade9ef2fe4f692721fd05051517ba01af574c21e70d98a0df98709f3a95
-EBUILD hardened-sources-2.6.34.ebuild 1857 RMD160 0ca937ff63eec0ffe2563cb4942081099049c3eb SHA1 84b3964032ac90dee98e84379403bcfae2099c61 SHA256 fcadd58b22565a29f5c9ce07f7edc881bf6f807484e3a65bc078f95afd2bb8e2
-MISC ChangeLog 69229 RMD160 15f6ccd602d0fdfc6d0e6858210880df70b73284 SHA1 c73b42d54af0ff371e07743e731dcb5ca5ccaed1 SHA256 579ecf7a04c4ad18c2dff0f630811f1c451cedcf1453308e7831aa59167451b6
+EBUILD hardened-sources-2.6.34-r1.ebuild 1705 RMD160 5eafc4d61df9109ffeb860b13636e8f4cc0b8ac1 SHA1 f7e3da0d4e2808003d4877381d4a845bebfd268e SHA256 a4e69ee93ed5193b1f828ed8cc405e35a2c4cd33430bf74849e3dd66443a6a89
+MISC ChangeLog 69419 RMD160 2ae7e776e240b559f46f3a492256d08478cac743 SHA1 500540fdd07b4292f9e05c537a9cd8845ba7ccde SHA256 ca7065e854394350bba5f77da328d8e6bb39b269c7d3b65caac454ef314bc7d1
 MISC metadata.xml 578 RMD160 7ea189a37d0f863ae9c52170bb85df27d21686fb SHA1 4765c25d7770a69f7b9dda2b1accc8ff27b74ad0 SHA256 64140e091b51002a5355d8fcfd351f2f39ed63da68af3a5751fc2058d0d03813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxG7FUACgkQp5vW4rUFj5r/eACcCOdL+ZZlO2+9EZ79Hq05RfIx
-cqUAoJeoZMsyWCd+rYUBOO7maHV4mUFv
-=wxUz
------END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.34.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r1.ebuild
index a24f56e4eef8..8748b61ba528 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.34.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.34.ebuild,v 1.1 2010/07/13 10:18:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.34-r1.ebuild,v 1.1 2010/07/24 11:21:02 blueness Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -9,7 +9,7 @@ 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"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
@@ -28,22 +28,18 @@ pkg_postinst() {
 	local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
 
 	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 "Hardened Gentoo provides four different predefined grsecurity level:"
+	ewarn "[server], [server no rbac] [workstation] [workstation no rbac]"
 	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 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
 	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 "${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