diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2011-11-27 18:12:40 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2011-11-27 18:12:40 +0000 |
| commit | af0ff9f0b8ab9b4ff46382744c6c977bc3349fdb (patch) | |
| tree | e7a257e7750eb428da50bb9d706137a6a3f7bf23 /sec-policy/selinux-base-policy | |
| parent | Drop use flag checks on gtk+, they have been long gone. (diff) | |
| download | gentoo-2-af0ff9f0b8ab9b4ff46382744c6c977bc3349fdb.tar.gz gentoo-2-af0ff9f0b8ab9b4ff46382744c6c977bc3349fdb.tar.bz2 gentoo-2-af0ff9f0b8ab9b4ff46382744c6c977bc3349fdb.zip | |
Stabilization of r5 policies (and modules depending on it); some cleanup in selinux-base-policy ebuilds
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'sec-policy/selinux-base-policy')
5 files changed, 14 insertions, 11 deletions
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog index 4a8bc8c99449..0fec67614cb3 100644 --- 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 fcb3fd8a94ff..47535f6b3813 100644 --- 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 d2ddd005afdb..efb0a9f5ec31 100644 --- 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 67668e92d39f..e6f32be0bde6 100644 --- 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 542c10e36206..d6f1b30a6b6a 100644 --- 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." |