Add 2.6.26-r5, clean out old versions.

(Portage version: 2.1.4.5)

3 files changed, 12 insertions, 55 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/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}"