diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2013-03-29 10:59:47 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2013-03-29 10:59:47 +0000 |
| commit | e12ee640cedaa1b1bf79b10c981e69dad565e754 (patch) | |
| tree | 56fbafadda8dbe2426f8ebeb780b92c1573c01d5 /sec-policy | |
| parent | Drop bashisms from init script. Thanks to Nico Baggus <mlspamcb@noci.xs4all.n... (diff) | |
| download | gentoo-2-e12ee640cedaa1b1bf79b10c981e69dad565e754.tar.gz gentoo-2-e12ee640cedaa1b1bf79b10c981e69dad565e754.tar.bz2 gentoo-2-e12ee640cedaa1b1bf79b10c981e69dad565e754.zip | |
Fix bug #462952 - cyclic dependency for unconfined
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)
Diffstat (limited to 'sec-policy')
| -rw-r--r-- | sec-policy/selinux-base-policy/ChangeLog | 6 | ||||
| -rw-r--r-- | sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog index 073445a407b0..362f441b49b9 100644 --- a/sec-policy/selinux-base-policy/ChangeLog +++ b/sec-policy/selinux-base-policy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sec-policy/selinux-base-policy # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.129 2013/03/29 10:50:56 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.130 2013/03/29 10:59:47 swift Exp $ + + 29 Mar 2013; Sven Vermeulen <swift@gentoo.org> + selinux-base-policy-9999.ebuild: + Fix bug #462952 - cyclic dependency for unconfined 29 Mar 2013; Sven Vermeulen <swift@gentoo.org> selinux-base-policy-2.20120725-r12.ebuild: diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild index 55043bc2d1b9..64c9057c39c4 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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-9999.ebuild,v 1.4 2013/03/26 19:16:52 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.5 2013/03/29 10:59:47 swift Exp $ EAPI="4" inherit eutils git-2 @@ -27,6 +27,14 @@ S="${WORKDIR}/" # itself), when reworked reinclude it. Only postinstall (where -b base.pp is # added) needs to remain then. +pkg_pretend() { + for i in ${POLICY_TYPES}; do + if [[ "${i}" == "targeted" ]] && ! use unconfined; then + die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory." + fi + done +} + src_prepare() { local modfiles |