Add 2.6.26-r5, clean out old versions.

Package-Manager: portage-2.1.4.5

4 files changed, 15 insertions, 64 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index aa873829cc0b..c8f28a640883 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.250 2008/11/02 20:32:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.251 2008/11/03 07:33:28 gengor Exp $
+
+*hardened-sources-2.6.26-r5 (03 Nov 2008)
+
+  03 Nov 2008; Gordon Malm <gengor@gentoo.org>
+  -hardened-sources-2.6.25-r7.ebuild, -hardened-sources-2.6.26-r2.ebuild,
+  +hardened-sources-2.6.26-r5.ebuild:
+  2.6.26-r5: Bump to Linux 2.6.26.7, PaX updates.
+  Clean out some old versions.
 
   02 Nov 2008; nixnut <nixnut@gentoo.org> hardened-sources-2.6.25-r9.ebuild:
   Stable on ppc
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index d22a42dc1569..0e089926ea95 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,22 +1,16 @@
-DIST genpatches-2.6.25-10.base.tar.bz2 117709 RMD160 01a20f51da3e0cd6e41a04010315691c8cf7338a SHA1 f5deff54a3c19ad1ce44a8756ce8e04d81da1077 SHA256 182c8a8b06a10dfabc348521af4302ae40b1bc41813eeab704ed709f3fd1be04
-DIST genpatches-2.6.25-10.extras.tar.bz2 41696 RMD160 d5dd5f902dc5555e52c177d6c992d4d7a9d7d34e SHA1 3d7660caccc60a33f287cf0123e8cf4ec96ef5b3 SHA256 5fbb7d88d9624faf6fba3d4115eed7e726802cea60291971ae36f4d62cbc7b32
 DIST genpatches-2.6.25-11.base.tar.bz2 137951 RMD160 c8df40098760d8796e653140cbb1df1ec7f42ab7 SHA1 bd94c26d6246279ed53042523de99ebaf13dd6e8 SHA256 a651296c2aa446665211c4e4de304e47f765dc2f21a4b20251ebeeb1cb1b2c83
 DIST genpatches-2.6.25-11.extras.tar.bz2 41737 RMD160 c6cf651ccb5ef6ab7a82f1a07c88461309ffc0be SHA1 bcb0846d4450204afb0f2185d1396ccf4f497032 SHA256 2033b6b4cb75a9293349ef81d7f4702935c974541bdfa013a4258894b4152fad
-DIST genpatches-2.6.26-2.base.tar.bz2 47157 RMD160 953e262b25bab8bb32d530fee0a2eb97ba58fcce SHA1 d12da61c4a079a423d22526e7630ac35772e19a0 SHA256 ff9404e89067beeb6bae8a8eb1c1d362abb5d11c5b0a92abde67e30b856ea5ba
-DIST genpatches-2.6.26-2.extras.tar.bz2 41342 RMD160 1273b577012f1047f2dfff60afc2dfda16756c1e SHA1 cdf5503702804c09251b368ddf4118388020fda1 SHA256 e69683f14fc7155ba2b9049ad08dc59b91d3920caefab82f24d8f843fae350f0
 DIST genpatches-2.6.26-3.base.tar.bz2 110317 RMD160 09e71a575ac26ae75b3336d2a5cd11f3c6818c6b SHA1 6b342afe5b9d31d48f1e93e32021c9140a8afd40 SHA256 a858f79088f6c914254a022a9afd6b508a838fc9a7262eb758bc0b97f56610a3
 DIST genpatches-2.6.26-3.extras.tar.bz2 41342 RMD160 1273b577012f1047f2dfff60afc2dfda16756c1e SHA1 cdf5503702804c09251b368ddf4118388020fda1 SHA256 e69683f14fc7155ba2b9049ad08dc59b91d3920caefab82f24d8f843fae350f0
 DIST hardened-patches-2.6.25-10.extras.tar.bz2 224878 RMD160 cb12103df2faa5d007073c82522ef3e75a7b6968 SHA1 b90165279b2a3d2d056abb13cab92d902d659263 SHA256 379225d7a3ba5deee99dd03cdd254d150283be1ca7c8b31d0bc7b6fe6e55cf2a
-DIST hardened-patches-2.6.25-8.extras.tar.bz2 237056 RMD160 6f8d54bbf881be6acc605b26a8e59555e7ffd097 SHA1 b72ac1831c49b9865c3a7335ae5563e5f9d8959c SHA256 7606b80b02143d54f38e8779c750a1e94ec638952273739e1ec9f64fc995cfce
 DIST hardened-patches-2.6.25-9.extras.tar.bz2 220144 RMD160 583138f09370668a128ef0c5206bd24cb276c828 SHA1 4921fda8b2ac2c388594224e5734c4dbde7269b8 SHA256 ceed813fabf8abe6346e96f1b7e2beef3559ce1b76cb41d897834a168cb15556
-DIST hardened-patches-2.6.26-3.extras.tar.bz2 256872 RMD160 c9cf33ff5eb51158b4cf10a34917f6aecc023d89 SHA1 5f45b9a32eb7af0915f2c4c8659d4871c21d0caa SHA256 9a648cb0e0a13d3ef3be093723fb06c09bf4b07c84330e3b83c52dc8d4f889f0
 DIST hardened-patches-2.6.26-5.extras.tar.bz2 219804 RMD160 cd19a8b3eb913ada6cbe90d6bebae624a25bd64b SHA1 2f9fe6c98d8b567aeb2d7db493d73105e009bd57 SHA256 8dca1f3dbe23c9ecfaf22fcee3199eee5c80d289c4b7b1efa4f78b6fe0e880ab
+DIST hardened-patches-2.6.26-6.extras.tar.bz2 229288 RMD160 3fb6996ae02bbd4f7e6113267f1c68df9d6eb149 SHA1 30d2d8abad3cb161a23f354fc1b39b14533e0be1 SHA256 8bc55b0c5c99b230d6561b2b78d1ed3c1e9d796ddfc7089fea132aef0cc9a36b
 DIST linux-2.6.25.tar.bz2 48601689 RMD160 cf3ed52f888fe9df7a93abe4fdc2f598e1ba0ce4 SHA1 aa6187a1c212dd2d8bd906b023fcefdcf711f35e SHA256 108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
 DIST linux-2.6.26.tar.bz2 49441874 RMD160 57c37e81afa48e7c05e1a933d390a12ac2921255 SHA1 3f44384bf84f27add3b6c43ec68f974d7f7e9c67 SHA256 666488e2511393fdb901eaf1e67275bcc38ab37c930e8a9adb290a95c1721a2a
-EBUILD hardened-sources-2.6.25-r7.ebuild 1956 RMD160 12b525e214f38f7fe54bbb02409f5572086a02b8 SHA1 3da0d8cbfb723bbb90ecc6b037715dd4c721494f SHA256 5d69f23ac0176d9fb1068a88eb4f0e0a9a8c3f2b5712f53ea074dc042a2bf639
 EBUILD hardened-sources-2.6.25-r8.ebuild 1956 RMD160 e0462fab41b86729508ec0cb20a9049ad47b8691 SHA1 d86736c57b304ac062bca988bc83e1e859733e39 SHA256 50e501c3f683161689eebeab574dfa0be10e571b829bb1c0267f84a2b549b0d6
 EBUILD hardened-sources-2.6.25-r9.ebuild 1957 RMD160 9b6c6de98c623b3964a0a14d8d86576bcaca8e18 SHA1 93153b28f7f8b6d97b742a1dc5912363f1c2b514 SHA256 0e0c28596016987bc698ccfa7d9f63b519d22bea623765e6ac7265e2e27bcdce
-EBUILD hardened-sources-2.6.26-r2.ebuild 1958 RMD160 12ab17e5578c55cbc8bde26e44d7a86d0b760135 SHA1 eb1c4dc27f808c6108d0ca45047e3792505a940e SHA256 5c39ee195b824104f90c4233ab805fd3d88c949b201280aeaee5e0c0f3f2f0da
 EBUILD hardened-sources-2.6.26-r4.ebuild 1958 RMD160 189d4c67ee8aefc29878a7880a1cd6a8c1673bb3 SHA1 1d7242cf72b919c32655dd72fc736ebe6a22988a SHA256 69f6633dcea39cd865d46d5daeebfb324000db25abaf0452bbbeaf90c2c97c85
-MISC ChangeLog 56408 RMD160 0983a7c5b31efabd07aa2aeb7e98841f21d19bc0 SHA1 8462bcd9a763a45a987d3b7dc6a389a9197a3979 SHA256 5d7383764e70fcc589a32627510c352f995b4a3c46d36e1d190649b4b582b01e
+EBUILD hardened-sources-2.6.26-r5.ebuild 1958 RMD160 abcbf919a74c8f9f10c0746d5b4d7ebc0bc1f4ed SHA1 929b6e97a7f063684d41620f2dc50051e4b4d48c SHA256 026621085fe96f56982d4624e9877e5c703579a6653090eb3dee29eabee502b9
+MISC ChangeLog 56692 RMD160 13c74c44611c4968432e790188f53866ea5b6aae SHA1 ca837170ed7b277e335942b798c5ca6b5bc322d1 SHA256 a870c8ec4f0a4816e4498d17ddb7268921fb8b438b76e82ed1b5d12577e6ea66
 MISC metadata.xml 541 RMD160 c1aeb8ba5490432cbb1ddd97bb83a38988e0906e SHA1 5c2615e7e4074cac951e491ead158bb4cbb637b9 SHA256 89a1257a0cfe45645ebe83f878abbf88e32bc25344967346833e4b651797acc2
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.25-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.25-r7.ebuild
deleted file mode 100644
index c3caa8355cb9..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.25-r7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 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.25-r7.ebuild,v 1.3 2008/09/20 16:11:28 nixnut Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
-HGPV_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/hardened-patches-${HGPV}.extras.tar.bz2
-	mirror://gentoo/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.4.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.12*"
-
-	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.26-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.26-r5.ebuild
index e9f3b6583ff8..4eda24c28ff1 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.26-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.26-r5.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2008 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.26-r2.ebuild,v 1.1 2008/09/13 20:09:11 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.26-r5.ebuild,v 1.1 2008/11/03 07:33:28 gengor Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="2"
+K_GENPATCHES_VER="3"
 
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-6"
 HGPV_URI="http://dev.gentoo.org/~gengor/distfiles/${CATEGORY}/${PN}/hardened-patches-${HGPV}.extras.tar.bz2
 	mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"