- proxy commit for gengor

2.6.26: Initial 2.6.26 release.
2.6.25-r4: Update to Linux 2.6.25.15.  Fixes security bugs #234799, #234803 and #234812.
2.6.25-r2: Removed.
(Portage version: 2.1.4.4)

3 files changed, 75 insertions, 13 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 7fe9a874b35b..a195f70e2379 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,15 @@
 # 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.232 2008/08/16 17:47:32 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.233 2008/08/18 01:39:02 solar Exp $
+
+*hardened-sources-2.6.26 (18 Aug 2008)
+*hardened-sources-2.6.25-r4 (18 Aug 2008)
+
+  18 Aug 2008; <solar@gentoo.org> -hardened-sources-2.6.25-r2.ebuild,
+  +hardened-sources-2.6.25-r4.ebuild, +hardened-sources-2.6.26.ebuild:
+  - proxy commit for gengor 2.6.26: Initial 2.6.26 release. 2.6.25-r4: Update
+  to Linux 2.6.25.15. Fixes security bugs #234799, #234803 and #234812.
+  2.6.25-r2: Removed.
 
   16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove phreak from metadata.xml (#96398)
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.25-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.25-r4.ebuild
index fab1928a4db6..41da393c61d8 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.25-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.25-r4.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.25-r2.ebuild,v 1.1 2008/07/05 00:52:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.25-r4.ebuild,v 1.1 2008/08/18 01:39:02 solar Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="7"
+K_GENPATCHES_VER="8"
 
 inherit kernel-2
 detect_version
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-5
 HGPV_URI="http://confucius.dh.bytemark.co.uk/~kerin.millar/distfiles/hardened-patches-${HGPV}.extras.tar.bz2
 	mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
 UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
@@ -23,22 +23,26 @@ 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 "If you intend to use one of these predefined grsecurity levels,"
-	ewarn "please read the help associated with the level. If you intend to"
-	ewarn "import a previous kernel configuration, please review your selected"
-	ewarn "grsecurity/PaX options carefully before building the kernel."
+	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 "If you intend to use grsecurity's RBAC system then you must ensure that"
-	ewarn "you are using a recent version of gradm (2.1.12 or higher). As such, it"
-	ewarn "is strongly recommended that you run the following command before"
-	ewarn "booting with a 2.6.25 kernel for the first time:"
+	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 '>=sys-apps/gradm-2.1.12'"
+	ewarn "emerge -na =${GRADM_COMPAT}"
 	ewarn
 }
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.26.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.26.ebuild
new file mode 100644
index 000000000000..b1b560c56a6e
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.26.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild,v 1.1 2008/08/18 01:39:02 solar Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1
+HGPV_URI="http://confucius.dh.bytemark.co.uk/~kerin.millar/distfiles/hardened-patches-${HGPV}.extras.tar.bz2
+	mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.4.patch"
+DESCRIPTION="Hardened kernel sources ${OKV}"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE=""
+
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+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
+}