diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2013-03-26 19:16:52 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2013-03-26 19:16:52 +0000 |
| commit | 134d991051edfb6261e0dc90736861c4668c8a1b (patch) | |
| tree | c3443bbd92ce4d74ae5ef7e483bf681f8306a236 /sec-policy/selinux-base-policy | |
| parent | Version bump. Bring EAPI=5 and python-r1 sweetness. (diff) | |
| download | gentoo-2-134d991051edfb6261e0dc90736861c4668c8a1b.tar.gz gentoo-2-134d991051edfb6261e0dc90736861c4668c8a1b.tar.bz2 gentoo-2-134d991051edfb6261e0dc90736861c4668c8a1b.zip | |
Mark unconfined package as a PDEPEND, fixes cyclic dependency mentioned in bug #462952
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB)
Diffstat (limited to 'sec-policy/selinux-base-policy')
3 files changed, 11 insertions, 7 deletions
diff --git a/sec-policy/selinux-base-policy/ChangeLog b/sec-policy/selinux-base-policy/ChangeLog index 39cb5c7da2d5..99c03c1d51fb 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.127 2013/03/09 13:52:59 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/ChangeLog,v 1.128 2013/03/26 19:16:52 swift Exp $ + + 26 Mar 2013; Sven Vermeulen <swift@gentoo.org> + selinux-base-policy-2.20120725-r12.ebuild, selinux-base-policy-9999.ebuild: + unconfined package is PDEPEND, otherwise circular dependency. See bug #462952 09 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-2.20120725-r12.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r12.ebuild index 8b1b4771f1fb..41d1e5b403bb 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r12.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r12.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-2.20120725-r12.ebuild,v 1.2 2013/03/09 13:52:59 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20120725-r12.ebuild,v 1.3 2013/03/26 19:16:52 swift Exp $ EAPI="4" inherit eutils @@ -11,8 +11,8 @@ DESCRIPTION="SELinux policy for core modules" IUSE="+unconfined" BASEPOL="2.20120725-r12" -RDEPEND=">=sec-policy/selinux-base-${PVR} - unconfined? ( sec-policy/selinux-unconfined )" +RDEPEND=">=sec-policy/selinux-base-${PVR}" +PDEPEND="unconfined? ( sec-policy/selinux-unconfined )" DEPEND="" SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2 http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${BASEPOL}.tar.bz2" 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 c7fccd857d93..55043bc2d1b9 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.3 2013/03/09 12:36:47 swift Exp $ +# $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 $ EAPI="4" inherit eutils git-2 @@ -11,8 +11,8 @@ DESCRIPTION="SELinux policy for core modules" IUSE="+unconfined" BASEPOL="9999" -RDEPEND="=sec-policy/selinux-base-9999 - unconfined? ( sec-policy/selinux-unconfined )" +RDEPEND="=sec-policy/selinux-base-9999" +PDEPEND="unconfined? ( sec-policy/selinux-unconfined )" DEPEND="" EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git" EGIT_SOURCEDIR="${WORKDIR}/refpolicy" |