diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2013-03-26 19:17:03 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2013-03-26 19:17:03 +0000 |
| commit | 162b7de09240af2c137ed175feb508d64d08f8bd (patch) | |
| tree | 56f77f448dc602abc8c2ce66fc659398c1ff92c2 /sec-policy | |
| parent | Version bump. Bring EAPI=5 and python-r1 sweetness. (diff) | |
| download | historical-162b7de09240af2c137ed175feb508d64d08f8bd.tar.gz historical-162b7de09240af2c137ed175feb508d64d08f8bd.tar.bz2 historical-162b7de09240af2c137ed175feb508d64d08f8bd.zip | |
Mark unconfined package as a PDEPEND, fixes cyclic dependency mentioned in bug #462952
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB
Diffstat (limited to 'sec-policy')
4 files changed, 17 insertions, 13 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/Manifest b/sec-policy/selinux-base-policy/Manifest index 416a78e9ae5b..05f09e6ae001 100644 --- a/sec-policy/selinux-base-policy/Manifest +++ b/sec-policy/selinux-base-policy/Manifest @@ -13,18 +13,18 @@ DIST patchbundle-selinux-base-policy-2.20120725-r9.tar.bz2 426009 SHA256 7abc493 DIST refpolicy-2.20120725.tar.bz2 594120 SHA256 7cd46ed908a4001368e6509d93e306ec6c9af2bfa6b70db88c9eaaefe257c635 SHA512 9cbe27fe30460c018da2bb3d94f321d656a259bf4f2e7ce6c2b015d02b5801de8a68c765c154c30ba5abf4f986957c9f303fc95b453f53db4fc4040443512333 WHIRLPOOL 107c10e89e99a3c63f8a806989e869dffd5baca1b9e41e2b02b12067a796d11abc87ac41a9c44a44a61215ed36df127f79e045b00cfb67d3c5318a766ff78b89 EBUILD selinux-base-policy-2.20120725-r10.ebuild 3586 SHA256 564ffc8d5c4bfd60a8536f4b20b4c108214667c60dbeca576f248b32f5c458ed SHA512 9418fbba308556b6036877c7692d0bb20260745d0f6efe9b59ff4cd896a380df8c86ccfca77f051962c480d7ee0b153e752498c24c020b3fb7b83938583e1fcf WHIRLPOOL 7774af44be6ffcbf59adb11c94a03f6f91cf66a44a25647e5ba02738cfc53732d8838c62ce9d3cec668ecf07339fe96944d84aab47d1c541328c4c16e2d5cb55 EBUILD selinux-base-policy-2.20120725-r11.ebuild 3586 SHA256 5cf1b1612ba79547c90c9cf6355c5f1940f8d4a5ba5ccbd44e1694666df8698d SHA512 5511cf2eea0f909bcbd0642aa5685bcf939f7e1014e7bda0622685b9770f4c0d53736b64c25c1fed8d401c0675ca0c7d8d02b3a53584884f954f030733b0e23c WHIRLPOOL 15caf733478ec2431462e3533c641f5dcc9d2fa04962f0206d27208c1b829558340469960eac190b18b0f6afecb5840e945e40cbe72101db46d393eff624f3be -EBUILD selinux-base-policy-2.20120725-r12.ebuild 3792 SHA256 0ba98f197369d23d732162d3883524fa81fdf506961000d1368a733a5fe39e14 SHA512 0e4732acb11d16a622e44efce4ad4c8ee93cb35d76ceebf6d656d189d54f40f14d462576e3252ff4cdd3133976629ff6d7ca8c5afa42d99225ba474c115aeca5 WHIRLPOOL 91a325df9eff8f14f4cc653d54635157a9c330415a9aa1e77ddbc012104c29078307eab6524c1b4fb894188cc70c23462ac3d041cfd7c2479a90a08e084d4368 +EBUILD selinux-base-policy-2.20120725-r12.ebuild 3800 SHA256 7cde06628f3d21f22d3a3d855178852c9741f4eaf8684f4d876b85d6c729729a SHA512 399b06337af00cb5f49ad4051d28d9697abbee93cfbcde9d0e0f13ed37b2b245f5112a5da9d3b6779441b7eb0bf6a4fdc0da7802d36e6fb4dcd8ebe7e8153d61 WHIRLPOOL 653321420f65e4b38dd1d26a754d01afbb9c562ddcbbebe31a65f816805c0fe274ca438a8282a84e2acae31b3aaef696343e2e3db6f2f3dffd61b55332e51e21 EBUILD selinux-base-policy-2.20120725-r5.ebuild 3821 SHA256 0cf134d0dcebd4139f808bad2627f1c16959ef4199d05a177a31a967bc1e85c9 SHA512 c5609321c8be53cea48b43f34b637dde6a0daaf38a3f87fea71066778c224ffd5d549c7db2d29e01b2dd792aa6b37424b04a2915cda7434e5e5ad9cda89eeb52 WHIRLPOOL 14a72df7dc83b2405b9c8d96e7f48332663d2ace1e851c8bbac7fb76a278f5f2f23ce615b924632135850ac809a1c4dba32e1bfcbe08ba12e8fd7caa478b8820 EBUILD selinux-base-policy-2.20120725-r7.ebuild 3823 SHA256 fb9eb84a21543251a9249e76fe84461381d2d1af00afd6cd1fcf18f4b89dbcbe SHA512 a1d4ec29c1331be33bf451cf2e180aae8f478c7738a6d653c0bda01f7744bc405cb7818deaf3280b040a241cc0fa99bb1386f527592fe664d2d6fef98fb04439 WHIRLPOOL 4e510ef48009684917b90057efae5b6dc2bcad6905b3b629d7679eb7ea94651f5f6efc8810cb13797e6a73a0f814791c2553717790a262b2bd3de45f39a0bd8d EBUILD selinux-base-policy-2.20120725-r8.ebuild 3807 SHA256 0c5f2ad8645ef1db0b5e8070e0d22745f241e67dc8e2b2ce975df9cc96d0d40f SHA512 8bed09b7afa36c19c07408ea918c9177dbd192df706388475285d66b7ba6d0b28e722cec1bf187dc500c12c6cbbed2502e5b047f79f0a2627854f0f857d7d62f WHIRLPOOL 1e5d4c004a959aa279fa7d30b42ead52663c60b8d51852542fb686ae4e42a69cef31dba3a9761c8cb9f1747b57bc51ed7ed07bec7840012166e7060d4e51ea7b EBUILD selinux-base-policy-2.20120725-r9.ebuild 3585 SHA256 0363110682e900cfde72c7b7297bc64c4261e5aab1c91b016d6ad5d66336c5f8 SHA512 9a3a5efaeef8718a23328b72c91e393156c772a34853dabf7ee858cf1824570c71136150c53422d4000a1d48b9811e79fc477867c7840e1c714caa7d0e9198f4 WHIRLPOOL d83c300cd37711761a2a1b27771eb0393c3b7a6aa89737b52e35b6691189f4ff2261ebada571c7b4f2458f83ceb57e21f85dee1c1129e68e18f9e88da9c78581 -EBUILD selinux-base-policy-9999.ebuild 3207 SHA256 50c555128f1795a09b6570a23019894f8d522ee2e668b3509d43f0a94d9264bd SHA512 43925d2901acbda02e8397b87d4470268455a2dc6e2375109bf249d0ef5dc146937d18a1cc074a58217f8a170b63cc127f356e38601592555b22e91a549a38c6 WHIRLPOOL 60a3edaac27580fd5fbb4e85a20f87e9de8b7ab7433bc5040b30257c7bb9adde894a726214bd3648e21946c9cc236a82cad871bf6cc198cfbbdf66adaaf55a22 -MISC ChangeLog 28876 SHA256 20d184e375cbb2820a96c2a76fe4c791e7a8a263b66bf44128c4c85840dc400b SHA512 a8b16839cd0f66fb90326b37106e80adcec1ca9e45d775dcffc88887ca7008341eba1d397785e7093e39c154f509f540f21b5385be0d3ddc3a313faf45ffe123 WHIRLPOOL a028d237bd6a3b8699fcb1046dc1d1faf599a9fa9f38aef77bd63d151bdedb6f5ac2614fe65f13610496000c0bce198ccf3af1388d0f69f0533727a3bcf8b2e7 +EBUILD selinux-base-policy-9999.ebuild 3215 SHA256 be885e66d89169131317fa182e03aeab646039e74979386f71223cc3ca1079a9 SHA512 05b0b37589700802cbded0565ba8eaa44df2fd54da1449abbed4197b8b9a812556f2dd819df288f95235605f0a56e74bb077b4d2c69c6554ff9f65fee9b1026b WHIRLPOOL 06d13a3f6ad703400b993f3b6b5f4407eee29ecfbe91d797cf1de13c6a4e802e2a556b44ea00bbe5e8f77320770b0e2e589ccb596f927b21c8d176de9765c759 +MISC ChangeLog 29084 SHA256 0ca1471c82c8a7392bab0d35480ec1c78b74c85969b3474c94bdd1b422190246 SHA512 00b0746d11445b83f28802ff1a0c1a375267abfbd4014a37734ae69053b64fdfeab3f6c463fe251c8c36673f328cd5ce548a0c9bb094295093c599537292d7b9 WHIRLPOOL 23ea010e1f84feafe8f3b96a9762433e4d542daa7aecb2504c32042d10815fec2f63acb3e81d5d7d4920a8d946b3af9c07c079aa2f7c45986fb0507e373bcb61 MISC metadata.xml 448 SHA256 4babd5e53785136aa79ee0737a89af1fc49c4fc144aba0f6163d6f85215f57e2 SHA512 7e747c9dbae3eaee62a284824a68039961264540e0633e617aaabaeef2e83f4623863d29ee26c2e4738ac706d3824914f530f8e2b990ac7f06aa8f6e4cae9964 WHIRLPOOL 733957f76ca89c6fdd08060a368048276247994db56cf8325e69b896a07dc5e576ca124f3190079b169ec078a2e69156d4b12e6c6cc94328248705779f357bc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlE7Pn4ACgkQXfqz7M26L9tRTACgjFLxT+SclmsB1DyvyYr9Kzs+ -XVgAn0GPlTkPIdBq7FsCMVU9F3ZAfe1V -=UZb4 +iEYEAREIAAYFAlFR89EACgkQXfqz7M26L9tWggCeIfJNa+Ef3C45fxpfIfsQi9Ul +cDoAmwTbHQNBQ1J5ohTRQ/ez5XdxKgQ1 +=QIMi -----END PGP SIGNATURE----- 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" |