Stabilization of r5 policies (and modules depending on it); some cleanup in selinux...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/sec-policy/selinux-asterisk/ChangeLog b/sec-policy/selinux-asterisk/ChangeLog
index 10b3b07a0e558a4657be4a38cc851f74e1fdd5f2..9f69bed3bc6f89b9bad2f764e41195f9b77fdaf8 100644 (file)
--- a/sec-policy/selinux-asterisk/ChangeLog
+++ b/sec-policy/selinux-asterisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.23 2011/11/12 20:53:16 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/ChangeLog,v 1.24 2011/11/27 18:12:40 swift Exp $
+
+  27 Nov 2011; <swift@gentoo.org> selinux-asterisk-2.20110726-r2.ebuild:
+  Stable on amd64/x86
 
   12 Nov 2011; <swift@gentoo.org> -selinux-asterisk-2.20101213.ebuild:
   Removing old policies

diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild
index 30538743a757ebb6ae77c5c17d54ec7efd144cbc..fa3610a61064e5cbadbb8e06d68f56d0ad6befaa 100644 (file)
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild,v 1.1 2011/10/23 11:00:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-asterisk/selinux-asterisk-2.20110726-r2.ebuild,v 1.2 2011/11/27 18:12:40 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for asterisk"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog
index 4a8bc8c99449d3eb67b9ea8ca7da37aac2ff8cb1..0fec67614cb3908addc09465774430e7cedf1f99 100644 (file)
--- a/sec-policy/selinux-base-policy/ChangeLog
+++ b/sec-policy/selinux-base-policy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sec-policy/selinux-base-policy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.88 2011/11/15 10:42:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.89 2011/11/27 18:12:39 swift Exp $
+
+  27 Nov 2011; <swift@gentoo.org> selinux-base-policy-2.20110726-r4.ebuild,
+  selinux-base-policy-2.20110726-r5.ebuild,
+  selinux-base-policy-2.20110726-r6.ebuild, files/modules.conf:
+  Put XDG selection (for base) in modules.conf instead of ebuild hocus-pocus
+
+  27 Nov 2011; <swift@gentoo.org> selinux-base-policy-2.20110726-r5.ebuild:
+  Stable on x86/amd64
 
 *selinux-base-policy-2.20110726-r6 (15 Nov 2011)
 

diff --git a/sec-policy/selinux-base-policy/files/modules.conf b/sec-policy/selinux-base-policy/files/modules.conf
index fcb3fd8a94ff33ae5191417a6560a772c0e441ca..47535f6b38139ad55cf0894df2c71e4c87229400 100644 (file)
--- a/sec-policy/selinux-base-policy/files/modules.conf
+++ b/sec-policy/selinux-base-policy/files/modules.conf
@@ -47,3 +47,4 @@ udev = base
 userdomain = base
 usermanage = base
 unprivuser = base
+xdg = base

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r4.ebuild
index d2ddd005afdb191b298e3b9f5b0acabf009a5d0b..efb0a9f5ec313c34771bd7670db462864be43a2e 100644 (file)
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-2.20110726-r4.ebuild,v 1.2 2011/10/23 12:42:53 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r4.ebuild,v 1.3 2011/11/27 18:12:39 swift Exp $
 
 EAPI="4"
 IUSE="+peer_perms +open_perms +ubac doc"
@@ -83,8 +83,6 @@ src_configure() {
                then
                        echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
                fi
-               # Add xdg support
-               echo "xdg = base" >> "${S}/${i}/policy/modules.conf"
 
                sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
                        "${S}/${i}/build.conf" || die "build.conf setup failed."

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r5.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r5.ebuild
index 67668e92d39fac9f7ee0b1de536d25eee621941d..e6f32be0bde6708035ca76dfd3703d922dcff816 100644 (file)
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r5.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-2.20110726-r5.ebuild,v 1.1 2011/10/23 11:00:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r5.ebuild,v 1.2 2011/11/27 18:12:39 swift Exp $
 
 EAPI="4"
 IUSE="+peer_perms +open_perms +ubac doc"
@@ -14,7 +14,7 @@ SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-apps/policycoreutils-1.30.30
        >=sys-fs/udev-151"
@@ -83,8 +83,6 @@ src_configure() {
                then
                        echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
                fi
-               # Add xdg support
-               echo "xdg = base" >> "${S}/${i}/policy/modules.conf"
 
                sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
                        "${S}/${i}/build.conf" || die "build.conf setup failed."

diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild
index 542c10e362063a694cead8048703969e94fbd26c..d6f1b30a6b6aefabfc0057b4fa05deab180ba81f 100644 (file)
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-2.20110726-r6.ebuild,v 1.1 2011/11/15 10:42:24 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r6.ebuild,v 1.2 2011/11/27 18:12:39 swift Exp $
 
 EAPI="4"
 IUSE="+peer_perms +open_perms +ubac doc"
@@ -83,8 +83,6 @@ src_configure() {
                then
                        echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
                fi
-               # Add xdg support
-               echo "xdg = base" >> "${S}/${i}/policy/modules.conf"
 
                sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
                        "${S}/${i}/build.conf" || die "build.conf setup failed."

diff --git a/sec-policy/selinux-dbus/ChangeLog b/sec-policy/selinux-dbus/ChangeLog
index 26ea0936e7ec8030c14cc856b21fcfdbbdca036f..a2578bb37c6eb8416702246508795d28b4657bf1 100644 (file)
--- a/sec-policy/selinux-dbus/ChangeLog
+++ b/sec-policy/selinux-dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-dbus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.18 2011/11/12 20:53:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/ChangeLog,v 1.19 2011/11/27 18:12:40 swift Exp $
+
+  27 Nov 2011; <swift@gentoo.org> selinux-dbus-2.20110726-r1.ebuild:
+  Stable on x86/amd64
 
   12 Nov 2011; <swift@gentoo.org> -selinux-dbus-2.20101213.ebuild:
   Removing old policies

diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild
index 7127a34b8060b8726a06c2e4922c79f9ac3671f9..ca9947884bbd36ba5d1a040e7127949073b5a35b 100644 (file)
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild,v 1.1 2011/10/23 11:00:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dbus/selinux-dbus-2.20110726-r1.ebuild,v 1.2 2011/11/27 18:12:40 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -11,4 +11,4 @@ inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for dbus"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

diff --git a/sec-policy/selinux-mozilla/ChangeLog b/sec-policy/selinux-mozilla/ChangeLog
index b8c5625a1e5fd1338d994fd77e59a70c341ef8cb..fa5b4586af093d47bf9c70dcf1ddf26ba9f29d87 100644 (file)
--- a/sec-policy/selinux-mozilla/ChangeLog
+++ b/sec-policy/selinux-mozilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-mozilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.11 2011/11/12 20:53:31 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/ChangeLog,v 1.12 2011/11/27 18:12:39 swift Exp $
+
+  27 Nov 2011; <swift@gentoo.org> selinux-mozilla-2.20110726-r3.ebuild:
+  Stable on amd64/x86
 
   12 Nov 2011; <swift@gentoo.org> -files/fix-apps-mozilla-r2.patch,
   -files/fix-apps-mozilla-r3.patch, -files/fix-apps-mozilla-r4.patch,

diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild
index 51fe8957cdc2a661f9a24ca2f872f037549937fe..9b0cdf643e06d184c47e9c1e3620993fa61623a2 100644 (file)
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild,v 1.1 2011/10/23 11:00:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mozilla/selinux-mozilla-2.20110726-r3.ebuild,v 1.2 2011/11/27 18:12:39 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -10,4 +10,4 @@ BASEPOL="2.20110726-r5"
 inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for mozilla"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

diff --git a/sec-policy/selinux-pan/ChangeLog b/sec-policy/selinux-pan/ChangeLog
index d8319803d7c9769b9aec9d86c0a98b2320ed0d53..1ddc53ec2c2ccfb42e504644736574b4a61ecef0 100644 (file)
--- a/sec-policy/selinux-pan/ChangeLog
+++ b/sec-policy/selinux-pan/ChangeLog
@@ -1,5 +1,8 @@
 
 
+  27 Nov 2011; <swift@gentoo.org> selinux-pan-2.20110726-r2.ebuild:
+  Stable on x86/amd64
+
   12 Nov 2011; <swift@gentoo.org> -files/fix-apps-pan-r1.patch,
   -selinux-pan-2.20101213-r1.ebuild:
   Removing old policies

diff --git a/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild
index e3952cf296faecd0e82c24930d2d2be47e755012..b9a3a3234cb395cca244ca98f1cb8acebb192cfa 100644 (file)
--- a/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild,v 1.1 2011/10/23 11:00:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-pan/selinux-pan-2.20110726-r2.ebuild,v 1.2 2011/11/27 18:12:39 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -10,4 +10,4 @@ BASEPOL="2.20110726-r5"
 inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for pan"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

diff --git a/sec-policy/selinux-skype/ChangeLog b/sec-policy/selinux-skype/ChangeLog
index e212676fcf26a96b2e7ecc67d8b8c406f48ebeee..63d214d5925a3f01e112cb50ab78a793a4b635aa 100644 (file)
--- a/sec-policy/selinux-skype/ChangeLog
+++ b/sec-policy/selinux-skype/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sec-policy/selinux-skype
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.8 2011/11/12 20:52:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/ChangeLog,v 1.9 2011/11/27 18:12:40 swift Exp $
+
+  27 Nov 2011; <swift@gentoo.org> selinux-skype-2.20110726-r2.ebuild:
+  Stable on amd64/x86
 
   12 Nov 2011; <swift@gentoo.org> -selinux-skype-2.20101213-r2.ebuild,
   -selinux-skype-2.20101213-r3.ebuild, -files/add-apps-skype.patch,

diff --git a/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild
index 9789f4b5413da49914b2ce9b12d43baf90ff6daa..ed91bc0d0f95a9833a69318813d02b581d89f1dc 100644 (file)
--- a/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild,v 1.1 2011/10/23 11:00:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-skype/selinux-skype-2.20110726-r2.ebuild,v 1.2 2011/11/27 18:12:40 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -10,4 +10,4 @@ BASEPOL="2.20110726-r5"
 inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for skype"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"