Fast track stabilization. See bug #338273. Removed older versions.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

7 files changed, 11 insertions, 195 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 745e03ac9983..5fe7a209aee4 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.338 2010/09/17 20:21:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.339 2010/09/21 20:31:48 blueness Exp $
+
+  21 Sep 2010; Anthony G. Basile <blueness@gentoo.org>
+  -hardened-sources-2.6.32-r14.ebuild, -hardened-sources-2.6.32-r15.ebuild,
+  hardened-sources-2.6.32-r18.ebuild, -hardened-sources-2.6.34-r2.ebuild,
+  -hardened-sources-2.6.34-r3.ebuild, hardened-sources-2.6.34-r6.ebuild:
+  Fast track stabilization. See bug #338273. Removed older versions.
 
 *hardened-sources-2.6.34-r6 (17 Sep 2010)
 *hardened-sources-2.6.32-r18 (17 Sep 2010)
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r14.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r14.ebuild
deleted file mode 100644
index cd5390311e3c..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r14.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.32-r14.ebuild,v 1.1 2010/08/21 11:50:29 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="17"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-17"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-# Note: 4420_grsecurity-2.2.0-2.6.32.19-201008131840.patch includes
-# 1800_page-table-unmap-for-stack-guard-fix.patch so we don't want
-# to apply it twice: see https://bugzilla.kernel.org/show_bug.cgi?id=16588
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="1800_page-table-unmap-for-stack-guard-fix.patch 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
-	ewarn
-	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.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.32-r15.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r15.ebuild
deleted file mode 100644
index 61ba1518e471..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.32-r15.ebuild,v 1.1 2010/09/02 22:26:57 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="19"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-18"
-HGPV_URI="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.6.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.2.0*"
-
-	ewarn
-	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.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.32-r18.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r18.ebuild
index ba24b84b1d7c..b39ef480da5d 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r18.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r18.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.32-r18.ebuild,v 1.1 2010/09/17 20:21:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r18.ebuild,v 1.2 2010/09/21 20:31:48 blueness Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 pkg_postinst() {
 	kernel-2_pkg_postinst
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r2.ebuild
deleted file mode 100644
index ec9f01353b16..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-r2.ebuild,v 1.1 2010/08/21 11:57:11 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="8"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
-HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-# Note: 4420_grsecurity-2.2.0-2.6.34.4-201008131840.patch includes
-# 1800_page-table-unmap-for-stack-guard-fix.patch so we don't want
-# to apply it twice: see https://bugzilla.kernel.org/show_bug.cgi?id=16588
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="1800_page-table-unmap-for-stack-guard-fix.patch 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.2.0*"
-
-	ewarn
-	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.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.34-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r3.ebuild
deleted file mode 100644
index 74184a4870b2..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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-r3.ebuild,v 1.1 2010/09/02 22:26:57 blueness Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="10"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
-HGPV_URI="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.6.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.2.0*"
-
-	ewarn
-	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.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.34-r6.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild
index 915c131da859..0d50bc349b97 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.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-r6.ebuild,v 1.1 2010/09/17 20:21:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.34-r6.ebuild,v 1.2 2010/09/21 20:31:48 blueness Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
@@ -20,7 +20,7 @@ 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"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 pkg_postinst() {
 	kernel-2_pkg_postinst