rm old, switch to epause, ebeep

9 files changed, 27 insertions, 222 deletions

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 0b065a8ce522..e87ae4ec0f4d 100644
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.28 2004/07/02 23:45:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.29 2004/09/06 01:13:57 pebenito Exp $
+
+  05 Sep 2004; Chris PeBenito <pebenito@gentoo.org>
+  selinux-base-policy-20040225.ebuild, -selinux-base-policy-20040509.ebuild,
+  -selinux-base-policy-20040604.ebuild, selinux-base-policy-20040629.ebuild,
+  selinux-base-policy-20040702.ebuild:
+  Remove old builds, switch to epause and ebeep in remaining builds.
 
 *selinux-base-policy-20040702 (02 Jul 2004)
 
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index e0ab8e505a4f..9a36408e206a 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8098f5e2b3f198edf5b82c6e1a4530e5 ChangeLog 8276
+MD5 76da98ba40fd019a423678c4eecd0db9 ChangeLog 8591
 MD5 808b5f7f5d6654666e9193672d463229 metadata.xml 473
-MD5 2e73809684fe415f46227077effb292a selinux-base-policy-20040225.ebuild 2217
-MD5 1ec05b5603cc44bc8b406af4f6efd260 selinux-base-policy-20040509.ebuild 2673
-MD5 3552d68f16615f11fa6fd0afbdc871be selinux-base-policy-20040604.ebuild 2673
-MD5 c9ac9b3040b3cd2ed94ca63608899cfe selinux-base-policy-20040629.ebuild 2673
-MD5 72d9d7c392025ba8073509efd41d1b10 selinux-base-policy-20040702.ebuild 2673
+MD5 f4f60b17659a9d7e23209fbd4149f541 selinux-base-policy-20040225.ebuild 1803
+MD5 c6093a25f1662f9c9938956bcde5dd1d selinux-base-policy-20040629.ebuild 2275
+MD5 c95d853ea9fdf166ae11ace4726e8123 selinux-base-policy-20040702.ebuild 2275
 MD5 7afea4eea1a3c5611ca773551fbd1bb5 files/digest-selinux-base-policy-20040225 80
-MD5 0671869ee0d92a38cfabe4491da88e1c files/digest-selinux-base-policy-20040509 80
-MD5 0c51e2c101c04d1a58f6da20add86a86 files/digest-selinux-base-policy-20040604 80
 MD5 b04dbcde2eb7e0f4177e3076075fe6ca files/digest-selinux-base-policy-20040629 80
 MD5 aa75977434391487a1fe3dfe2394157d files/digest-selinux-base-policy-20040702 80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBOx1uGFJQsIJWJy4RArL6AJ9X09xO7I3An5kUYUTxuvvhjnfiogCfRKt4
-DM66htLA1PaUIaYEtYIZ8W4=
-=iPUj
+iD8DBQFBO7nrGFJQsIJWJy4RAgJZAJ9s/G5sgs/K1BiRx9Xc9752Ks7bLQCcCGWi
+VzTuroRP/SzpUicL2PV9OQc=
+=XGmv
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040509 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040509
deleted file mode 100644
index 3d1f6729a924..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040509
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eaf9820fe749a6ebbcc4ac203acb6cf3 selinux-base-policy-20040509.tar.bz2 67643
diff --git a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040604 b/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040604
deleted file mode 100644
index 93c8057c758c..000000000000
--- a/sec-policy/selinux-base-policy/files/digest-selinux-base-policy-20040604
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d33b40353796d47b588f46de7b74c695 selinux-base-policy-20040604.tar.bz2 68772
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040225.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040225.ebuild
index b92955ace14a..d18be9748fa8 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040225.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20040225.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-20040225.ebuild,v 1.6 2004/06/28 00:10:36 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20040225.ebuild,v 1.7 2004/09/06 01:13:57 pebenito Exp $
 
 IUSE="build"
 
@@ -60,13 +60,6 @@ pkg_postinst() {
 	echo
 	ewarn "Please check the Changelog, there may be important information."
 	echo
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 8
+	ebeep 4
+	epause 4
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040509.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040509.ebuild
deleted file mode 100644
index 6114623508b3..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040509.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 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-20040509.ebuild,v 1.4 2004/06/28 00:10:36 pebenito Exp $
-
-IUSE="build"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-DEPEND="build? ( sys-devel/make
-		 sys-devel/m4 )"
-RDEPEND="sys-devel/m4
-	 sys-devel/make"
-
-S=${WORKDIR}/base-policy
-
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
-
-# deprecated policies:
-DEPRECATED="domains/program/devfsd.te domains/program/opt.te
-	file_contexts/program/devfsd.fc file_contexts/program/opt.fc
-	file_contexts/users.fc"
-
-src_compile() {
-	return
-}
-
-src_install() {
-	if use build; then
-		# generate a file_contexts
-		dodir ${POLICYDIR}/file_contexts
-		einfo "Ignore the checkpolicy error on the next line."
-		make -C ${S} \
-			FC=${D}/${POLICYDIR}/file_contexts/file_contexts \
-			${D}/${POLICYDIR}/file_contexts/file_contexts
-
-		[ ! -f ${D}/${POLICYDIR}/file_contexts/file_contexts ] && \
-			die "file_contexts was not generated."
-	else
-		# install full policy
-		dodir /etc/security/selinux/src
-
-		insinto /etc/security
-		doins ${S}/appconfig/*
-
-		cp -a ${S} ${D}/${POLICYDIR}
-		rm -fR ${D}/${POLICYDIR}/appconfig
-	fi
-}
-
-pkg_postinst() {
-	local isdeprecated
-	echo
-	einfo "This is the base policy for SELinux on Gentoo.  This policy"
-	einfo "package only covers the applications in the system profile."
-	einfo "More policy may need to be added according to your requirements."
-	echo
-	eerror "It is STRONGLY suggested that you evaluate and merge the"
-	eerror "policy changes.  If any of the file contexts (*.fc) have"
-	eerror "changed, you should also relabel."
-	echo
-	ewarn "Please check the Changelog, there may be important information."
-	echo
-	echo
-
-	einfo "Checking for deprecated policy..."
-	for i in $DEPRECATED; do
-		if [ -f "${POLICYDIR}/${i}" ]; then
-			eerror "${POLICYDIR}/${i}"
-			isdeprecated="y"
-		fi
-	done
-	[ "${isdeprecated}" ] && \
-		eerror "The above policy file(s) should be removed if possible." || \
-		einfo "None found."
-
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 4
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040604.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040604.ebuild
deleted file mode 100644
index cc5d35286c19..000000000000
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040604.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 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-20040604.ebuild,v 1.4 2004/06/28 00:10:36 pebenito Exp $
-
-IUSE="build"
-
-DESCRIPTION="Gentoo base policy for SELinux"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-DEPEND="build? ( sys-devel/make
-		 sys-devel/m4 )"
-RDEPEND="sys-devel/m4
-	 sys-devel/make"
-
-S=${WORKDIR}/base-policy
-
-[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy"
-
-# deprecated policies:
-DEPRECATED="domains/program/devfsd.te domains/program/opt.te
-	file_contexts/program/devfsd.fc file_contexts/program/opt.fc
-	file_contexts/users.fc"
-
-src_compile() {
-	return
-}
-
-src_install() {
-	if use build; then
-		# generate a file_contexts
-		dodir ${POLICYDIR}/file_contexts
-		einfo "Ignore the checkpolicy error on the next line."
-		make -C ${S} \
-			FC=${D}/${POLICYDIR}/file_contexts/file_contexts \
-			${D}/${POLICYDIR}/file_contexts/file_contexts
-
-		[ ! -f ${D}/${POLICYDIR}/file_contexts/file_contexts ] && \
-			die "file_contexts was not generated."
-	else
-		# install full policy
-		dodir /etc/security/selinux/src
-
-		insinto /etc/security
-		doins ${S}/appconfig/*
-
-		cp -a ${S} ${D}/${POLICYDIR}
-		rm -fR ${D}/${POLICYDIR}/appconfig
-	fi
-}
-
-pkg_postinst() {
-	local isdeprecated
-	echo
-	einfo "This is the base policy for SELinux on Gentoo.  This policy"
-	einfo "package only covers the applications in the system profile."
-	einfo "More policy may need to be added according to your requirements."
-	echo
-	eerror "It is STRONGLY suggested that you evaluate and merge the"
-	eerror "policy changes.  If any of the file contexts (*.fc) have"
-	eerror "changed, you should also relabel."
-	echo
-	ewarn "Please check the Changelog, there may be important information."
-	echo
-	echo
-
-	einfo "Checking for deprecated policy..."
-	for i in $DEPRECATED; do
-		if [ -f "${POLICYDIR}/${i}" ]; then
-			eerror "${POLICYDIR}/${i}"
-			isdeprecated="y"
-		fi
-	done
-	[ "${isdeprecated}" ] && \
-		eerror "The above policy file(s) should be removed if possible." || \
-		einfo "None found."
-
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 4
-}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040629.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040629.ebuild
index 65a0f8796fb5..f915d2bf8d6a 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040629.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20040629.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 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-20040629.ebuild,v 1.2 2004/08/30 01:16:39 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20040629.ebuild,v 1.3 2004/09/06 01:13:57 pebenito Exp $
 
 IUSE="build"
 
+inherit eutils
+
 DESCRIPTION="Gentoo base policy for SELinux"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -77,13 +79,6 @@ pkg_postinst() {
 		eerror "The above policy file(s) should be removed if possible." || \
 		einfo "None found."
 
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 4
+	ebeep 4
+	epause 4
 }
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild
index 63554c86a94b..5298168f3548 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 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-20040702.ebuild,v 1.2 2004/09/05 14:06:09 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-20040702.ebuild,v 1.3 2004/09/06 01:13:57 pebenito Exp $
 
 IUSE="build"
 
+inherit eutils
+
 DESCRIPTION="Gentoo base policy for SELinux"
 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -77,13 +79,6 @@ pkg_postinst() {
 		eerror "The above policy file(s) should be removed if possible." || \
 		einfo "None found."
 
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 ; echo -ne "\a" ; sleep 1
-	sleep 4
+	ebeep 4
+	epause 4
 }