From 94d930658fe839dd3171730f83aa6271398aee97 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <pebenito@gentoo.org>
Date: Fri, 14 Aug 2009 21:19:30 +0000
Subject: Mark selinux policy 20080525 stable, clear old ebuilds. (Portage
 version: 13960-svn/cvs/Linux x86_64)

---
 sec-policy/selinux-base-policy/ChangeLog           |   7 +-
 .../selinux-base-policy-20070329.ebuild            | 108 --------------------
 .../selinux-base-policy-20070928.ebuild            | 110 ---------------------
 .../selinux-base-policy-20080525.ebuild            |   4 +-
 4 files changed, 8 insertions(+), 221 deletions(-)
 delete mode 100644 sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
 delete mode 100644 sec-policy/selinux-base-policy/selinux-base-policy-20070928.ebuild

(limited to 'sec-policy/selinux-base-policy')

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 7c4bfb7882cd..955a95230116 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.65 2009/08/14 18:58:38 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.66 2009/08/14 21:19:21 pebenito Exp $
+
+  14 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
+  -selinux-base-policy-20070329.ebuild,
+  -selinux-base-policy-20070928.ebuild, selinux-base-policy-20080525.ebuild:
+  Mark 20080525 stable, clear old ebuilds.
 
 *selinux-base-policy-2.20090814 (14 Aug 2009)
 
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
deleted file mode 100644
index 5e038d0e56e7..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20070329.ebuild,v 1.5 2009/07/22 13:12:36 pebenito Exp $
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-#KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-apps/policycoreutils-1.30.30"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-1.30.12"
-
-S=${WORKDIR}/
-
-src_unpack() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	unpack ${A}
-
-	cd "${S}/refpolicy"
-	epatch "${FILESDIR}/${PN}-${PV}.diff"
-
-	for i in ${POLICY_TYPES}; do
-		mkdir -p "${S}/${i}/policy"
-		cp "${FILESDIR}/modules.conf.${i}" "${S}/${i}/policy/modules.conf"
-	done
-}
-
-src_compile() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y"
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	cd "${S}/refpolicy"
-
-	make ${OPTS} generate || die "Failed to create generated module files"
-
-	make ${OPTS} xml || die "XML generation failed."
-
-	for i in ${POLICY_TYPES}; do
-#		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" conf \
-#			|| die "${i} modules.conf update failed"
-
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" base \
-			|| die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y DESTDIR=${D}"
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	cd "${S}/refpolicy"
-
-	for i in ${POLICY_TYPES}; do
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" install \
-			|| die "${i} install failed."
-
-		make ${OPTS} TYPE=${i} NAME=${i} install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
-
-		# libsemanage won't make this on its own
-		keepdir /etc/selinux/${i}/policy
-	done
-
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-}
-
-pkg_postinst() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	if has "loadpolicy" $FEATURES ; then
-		for i in ${POLICY_TYPES}; do
-			einfo "Inserting base module into ${i} module store."
-
-			cd /usr/share/selinux/${i}
-			semodule -s ${i} -b base.pp
-		done
-	else
-		echo
-		echo
-		eerror "Policy has not been loaded.  It is strongly suggested"
-		eerror "that the policy be loaded before continuing!!"
-		echo
-		einfo "Automatic policy loading can be enabled by adding"
-		einfo "\"loadpolicy\" to the FEATURES in make.conf."
-		echo
-		echo
-		ebeep 4
-		epause 4
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20070928.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20070928.ebuild
deleted file mode 100644
index 24ee97537dc9..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20070928.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20070928.ebuild,v 1.3 2009/07/22 13:12:36 pebenito Exp $
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-#KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=sys-apps/policycoreutils-1.30.30"
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	>=sys-apps/checkpolicy-1.30.12"
-
-S=${WORKDIR}/
-
-src_unpack() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-	MOD_CONF_VER="20070928"
-
-	unpack ${A}
-
-	cd "${S}/refpolicy"
-#	epatch ${FILESDIR}/${PN}-${PV}.diff
-
-	for i in ${POLICY_TYPES}; do
-		mkdir -p "${S}/${i}/policy"
-		cp "${FILESDIR}/modules.conf.${i}.${MOD_CONF_VER}" \
-			 "${S}/${i}/policy/modules.conf"
-	done
-}
-
-src_compile() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y"
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	cd "${S}/refpolicy"
-
-	make ${OPTS} generate || die "Failed to create generated module files"
-
-	make ${OPTS} xml || die "XML generation failed."
-
-	for i in ${POLICY_TYPES}; do
-#		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" conf \
-#			|| die "${i} modules.conf update failed"
-
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" base \
-			|| die "${i} compile failed"
-	done
-}
-
-src_install() {
-	local OPTS="MONOLITHIC=n DISTRO=gentoo QUIET=y DESTDIR=${D}"
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	cd "${S}/refpolicy"
-
-	for i in ${POLICY_TYPES}; do
-		make ${OPTS} TYPE=${i} NAME=${i} LOCAL_ROOT="${S}/${i}" install \
-			|| die "${i} install failed."
-
-		make ${OPTS} TYPE=${i} NAME=${i} install-headers \
-			|| die "${i} headers install failed."
-
-		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
-
-		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
-
-		# libsemanage won't make this on its own
-		keepdir "/etc/selinux/${i}/policy"
-	done
-
-	dodoc doc/Makefile.example doc/example.{te,fc,if}
-
-	insinto /etc/selinux
-	doins "${FILESDIR}/config"
-}
-
-pkg_postinst() {
-	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
-
-	if has "loadpolicy" $FEATURES ; then
-		for i in ${POLICY_TYPES}; do
-			einfo "Inserting base module into ${i} module store."
-
-			cd "/usr/share/selinux/${i}"
-			semodule -s "${i}" -b base.pp
-		done
-	else
-		echo
-		echo
-		eerror "Policy has not been loaded.  It is strongly suggested"
-		eerror "that the policy be loaded before continuing!!"
-		echo
-		einfo "Automatic policy loading can be enabled by adding"
-		einfo "\"loadpolicy\" to the FEATURES in make.conf."
-		echo
-		echo
-		ebeep 4
-		epause 4
-	fi
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild
index 0dd36cc9668f..1bc47800a03f 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild,v 1.2 2009/07/22 13:12:36 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20080525.ebuild,v 1.3 2009/08/14 21:19:21 pebenito Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 #KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/policycoreutils-1.30.30"
 DEPEND="${RDEPEND}
-- 
cgit v1.2.3-65-gdbad