Pushing out 2.20120215 SELinux policies

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 45 insertions, 6 deletions

diff --git a/sec-policy/selinux-entropyd/ChangeLog b/sec-policy/selinux-entropyd/ChangeLog
index c224650f9ab0..0902b3fd8db0 100644
--- a/sec-policy/selinux-entropyd/ChangeLog
+++ b/sec-policy/selinux-entropyd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sec-policy/selinux-entropyd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.2 2011/10/23 12:42:33 swift Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/ChangeLog,v 1.3 2012/03/31 12:29:18 swift Exp $
+
+  31 Mar 2012; <swift@gentoo.org> selinux-entropyd-2.20110726.ebuild,
+  +selinux-entropyd-2.20120215.ebuild:
+  Remove deprecated dependency
+
+*selinux-entropyd-2.20120215 (31 Mar 2012)
+
+  31 Mar 2012; <swift@gentoo.org> +selinux-entropyd-2.20120215.ebuild:
+  Bumping to 2.20120215 policies
 
   23 Oct 2011; <swift@gentoo.org> selinux-entropyd-2.20110726.ebuild:
   Stabilization (tracker #384231)
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild
index 915333070856..479dd24a3dff 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild,v 1.2 2011/10/23 12:42:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20110726.ebuild,v 1.3 2012/03/31 12:29:18 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -11,8 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for various entropy daemons (audio-entropyd, haveged, ...)"
 
 KEYWORDS="amd64 x86"
-RDEPEND="!<sec-policy/selinux-audio-entropyd-2.20110726
-		>=sys-apps/policycoreutils-1.30.30
+RDEPEND=">=sys-apps/policycoreutils-1.30.30
 		>=sec-policy/selinux-base-policy-${PV}"
 
 pkg_postinst() {
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20120215.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20120215.ebuild
new file mode 100644
index 000000000000..f814f6f5b683
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20120215.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-entropyd/selinux-entropyd-2.20120215.ebuild,v 1.1 2012/03/31 12:29:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="entropyd"
+BASEPOL="2.20120215-r1"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for various entropy daemons (audio-entropyd, haveged, ...)"
+
+KEYWORDS="~amd64 ~x86"
+
+pkg_postinst() {
+	einfo "The SELinux entropyd module is the replacement of audioentropyd and"
+	einfo "is made more generic for all-purpose entropy daemons, including"
+	einfo "audioentropyd and haveged."
+	einfo
+	einfo "If you are upgrading from an audioentropyd module, the installation"
+	einfo "of the new policy module might fail due to collisions. You will need"
+	einfo "to remove the current audioentropyd module first:"
+	einfo "  # semodule -r audioentropy"
+	einfo
+	einfo "Then, you can install the new policy:"
+	einfo "  # semodule -i /usr/share/selinux/<type>/entropyd.pp"
+	echo
+	einfo "Portage will automatically try to load the entropyd module now."
+	selinux-policy-2_pkg_postinst
+}