version bump and ebuild clean up, drop old RC

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

diff --git a/sys-apps/checkpolicy/ChangeLog b/sys-apps/checkpolicy/ChangeLog
index 2cf0a903818fea403e05b3ff54cf0dc9d5b274c3..7a13aaec1b40db582c9b42c6478b0c6337250e8a 100644 (file)
--- a/sys-apps/checkpolicy/ChangeLog
+++ b/sys-apps/checkpolicy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/checkpolicy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.82 2014/11/14 19:20:03 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/ChangeLog,v 1.83 2014/12/06 23:25:46 perfinion Exp $
+
+*checkpolicy-2.4_rc7 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org> +checkpolicy-2.4_rc7.ebuild,
+  -checkpolicy-2.4_rc5.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *checkpolicy-2.4_rc6 (14 Nov 2014)
 

diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 164f850aea4362d403f2af70e0f450440cd4fca0..8edb5b4904d952241f41239a58396ca9f120495b 100644 (file)
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -3,28 +3,30 @@ Hash: SHA256
 
 DIST checkpolicy-2.2.tar.gz 64458 SHA256 9ff6698f4d4cb59c9c916e348187d533ada4107f90c253ef7304905934e9adf8 SHA512 a6f70e1b6581673af515d7d192237e2d47c0e07bb589c64b92f90f3a450ef8c312eabc2384479faed8bb909b98c15b676cea77e7dcb5304a51314601e93bef59 WHIRLPOOL 18c13139e8b75bb5bd45a9ddbf0c17c07fa86da66e792ece4a1d1204d211766fec27f6fce7db248957e7d2b2847c91b4c9d0ef45cf64e106aee52bc29be7992c
 DIST checkpolicy-2.3.tar.gz 64970 SHA256 90632d11afecb66997971d4c5c5d70dfb02d3969ec610ee2918ba6df99c8207b SHA512 9b10cee8ec9d555c810712131eec0e7e1bf900e4675804b8f57b04988543ba784f4bf76030f196868cef91a1c4ec370f77da12ef9e79362bf7a1cc38c7cafcff WHIRLPOOL 49ca9fa1695bedf141d397ca679ba769b748dc39ec7d462718f6b90af9c31c1da64d1ff67b3b4e426f758a9d305dc9e19d755e1127bfcd5e492dccf09ac75d09
-DIST checkpolicy-2.4-rc5.tar.gz 65114 SHA256 73b416476e1ff21959589613b0e628ed28145379b71c36198f114db59b89b216 SHA512 dc4b6c2121ff97b88a5e7d8236de016f150202d34c561a6a6f74c4446fa405e624fa7179fb6f26272570f0d4772e9dc73e7ca958ac88e49d5e733dc345f064e0 WHIRLPOOL d8a9d9b8b975ff542caa09a341283ef403f6b23aa68e749d6d08c510322a8c5590ced811352037cdd40c93785b231bbeb2a6a8924f67c6fb4c19276e5fac5090
 DIST checkpolicy-2.4-rc6.tar.gz 65124 SHA256 be931814c6ac290575953f940cde38217a4855445630ac3f4d1780a88fc5008a SHA512 fc75b54002eb0a338bf63f787e52cccdc263512657d87c678225d2a8bbae7a20f16f489de7a56831106698fe9e7737ddef02df8a1d9c11c363c68787fa5a4ac7 WHIRLPOOL 18d473411899a5c349e4659de7242f624555029aff21d3a8f9ff85463ef46d2865555f8018cd307231d93846b157373756d0ff7a6e0e0c0f23f8a69951b696d9
+DIST checkpolicy-2.4-rc7.tar.gz 65125 SHA256 a7f8d44f6276b348ef99e9920c7dfd3a8409704e2fc1e993d777759478434ada SHA512 af0f73049a005f7a01de073c5e6aca17b3ecdd17e8288cc1b7e94db2a1ca0502b67ec0d03ebd10513f6b6de34c72ce55493a15c137070548e5889e9eec401521 WHIRLPOOL 94de0348af5e4f84cb18d59b9d8acec56360a82c33285d3abf12caa9d3e7b76dd6bf007017f7f4d885764f485f8e1da34ca5378e6fc9cc85bfd76fb137806ff0
 EBUILD checkpolicy-2.2.ebuild 1022 SHA256 0ec473da351b94f092f06cdfd506f97c48abb539efc3cc791fcc0b4be1d63145 SHA512 cfb60407488ee37b1844eb216b21ac1440240437cad176955b9689e4744bf23b35326159d0602c4939ffe19659614257c60fdb37eedabb4a02ecbde313eac137 WHIRLPOOL a1894e2759bde98d5bd0bf02f2c76cd78e38536a28b0d0c5f8c2b9a16d6ec1e07e02fd299128a59279ef38d1746a40c4e5100925aa1dabae3e60787d01c9cf3b
 EBUILD checkpolicy-2.3.ebuild 1099 SHA256 da1088f0cb65989b859c8269da0856e552fa0072a87dcef0ed96c024c7a5051a SHA512 f5f1e1a6be77ca36bde1ff940b717ec693a4e18289580524076b12f28614ba08b824d8bd0327e0b9bce6f98993b522f8dca88c3b54b56ce8190202707223cd78 WHIRLPOOL 89b9d09e30066fd72fb209f5cb9704f9089138f6f071884d6906fadf6f5fcb73213ad15c9e25c0858a4f80c80586276b6ec5b5cb30f88643e41ac1877eb94d2f
-EBUILD checkpolicy-2.4_rc5.ebuild 1113 SHA256 51ae3ca2a98ef7043629c7b54fc94c33111ca552714e9a9f8d89bc88cb2bf3e9 SHA512 fa5661bbc10cc181a37d683e477fbb7311d8c0b82071b98096e1d0a58903650c147b6e82e312e0828650c2dfc9d21fb159e25123fc52cb8ac0309fdb56f348bf WHIRLPOOL 45e712a5a9ad345264a81df238f8a74c3a4d70b128b01124d870e2e4386f06a308fa2b48c7012600f868dcd744bcc74ab099240919b1c4cb46dd6d3964867faa
 EBUILD checkpolicy-2.4_rc6.ebuild 1113 SHA256 88c51abd56ecb7bbcfdbbd83f9a2078fc1b745064b0e473b61d3c126bef963fb SHA512 1c0b64218885d0dc97404bb147228f48b05c7b2278259b7d6042f722591920e7cd5521aeca2a77b394397a29a7eea8a42475ff742efb4307bd3453bad97ed019 WHIRLPOOL 41db078139022b3f6bf89300070a5bad2d6b66013ecff1b5c94ba799a1e9e8b046b302db356f342879405a4fca061493f2e34f16a0eead2441cb3e074e9e3434
-MISC ChangeLog 10599 SHA256 e2657ffaaca970aecbc64ca165553bbe6ad0d3c781aa351d1fb00b38ac732582 SHA512 f7d1841f2662ceb3c53394b607942bfd8f66d93a6b0c0a0bc1bc1ba3b9cc9914aa024ad12dd499c63ea0ae6de8bee6c0cfedd268a60899cd105587080e5a5d36 WHIRLPOOL 1853cb47fb02238a6d3eefa947e908f98bf0f7f6398963ad846c9ed056d138e1ca0bb0b3501db69bb20d6688966d6c965d92da69fdc99ba9eccdf3e842ffba41
+EBUILD checkpolicy-2.4_rc7.ebuild 1099 SHA256 942e0c9bf461eddbc1bf7ef66c8e86fa71f35527bca8d8f56dd47436e9a09bbe SHA512 293e99f28a8ec7f3c5ea6c26a111429a6b8f7578a660bd022fd59cdab5b1ab796ba5bf2eba50b1c098d585311beb2ea7c388158bedc2b77430aab62f1b6de1c3 WHIRLPOOL b13b0b3dd63e91c3e799842403e47e9d4359ef914b328f5e321e10cc2eed405fbc0e62937ccf00b9bf03cb809521e4a0024bf57c4b6dfa234ba7069437edd440
+MISC ChangeLog 10798 SHA256 0604315f7401859c13562a1bf6510bf5df8260873423bf7dfa50cf72a2635f29 SHA512 5ef9793ab57ba0f09559d0b80648b49bd55847996c684c6bf1634124be064f37b868aa16e6655b42f23d9c04856ceaf26abb714565b12b3e57f5e1db7c79ec81 WHIRLPOOL 2f975318ebd600e0e11d42283a2679710ced10d8daaa42f1a0adbf7272a96cb014125a105cef92c5135ef5c7f998ac5ea016ff87cdf58c7e30c94ea89d81ec3d
 MISC metadata.xml 222 SHA256 b469c6bbb142dd5bab69af655d21fdddef8cec44c97750747e14649e0e5c2098 SHA512 6f61c65cfc7902e6439446cde64c83860a90d95be8494b8d16ae895ccc9eef0fd78c7fdbb0c17650967a1235d761245bb8cada1ab6aa19fa746f0ccf2ae68830 WHIRLPOOL 87cec6bffd811035d71e73d15fa753087731f704360ec53343c08e84682bab0a4f83546380cc1969abd93364ac7e1a2b5a448d531840a9f2dfbb5f987de5761e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUZlXNAAoJEC7dUkA7aK9HZRYQAJM/sfjV9YYN4LGsQ/TNmLz8
-NHaYTlDSz2rHMluaBQf74hQhb28k9xZgCjL/BJYxD7GAtIOm1go1WQ693z4hziNB
-k8rO0G9u6ztZ5PZAWiUQUHrdqOivKDFvG0LSSaObvrcGjFD0nBg9rRwDbBWJdkNc
-wPchMqqiivtSrka31E9GFMpCEvCDci2YAqf9b1n7Ihz8kRuiDTArwzAsxgt5BdC8
-5wstzsWD/akDCv/QUySPQsffRwicLinY6An/5pMOfcNOxgtcukVIRfgXM7vXvtM2
-UjGZskAMA2eKuNjVdNRAlox545uFXlKSBcLvslXhRGeX8LmUHfmas9Xs+FhMGhMV
-qzMoHcSCU4qdWoeLodG7V/6mXabjEhidB3gZUcd9RcDb6T7n6oubkFadhffZ4CEQ
-m+ykr+ZwhxYt1+1JXCuqSD+NNkYHa0VterPWR/i3KWd6MxFlKczBjqyXU1h+b7Hg
-GK5Ki6CqlExwMMS5q9kIylbJJSskd+4FYy8U8/oCrqEryYNHDC0xCjk+oQRuABRI
-8UgtIyIc2ftTSe8PNsfFI+Xz2YwB6/T7RgPaIp8mAcZtka28WgA/RY/jjGykPIvX
-vTEp2NMtA7vZ+n30K0m/AC0ASNH+oTivc0rt9uFguOW13i3ntjVdPB/dphDyPXET
-dCZZQfz/zh9vhj/EkjlA
-=ZaQ3
+iQJ8BAEBCABmBQJUg5B7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9ViYkP/2nnt/9OeboUHisyfxJCJiJb
+5Le7hwxgEh5o16sXsBdmbpBqIhLyvrhYsW8UvPvod9nc5lg9OAFl5FuAyRWnLgK6
+wzF9525bhAaXn3UFeh0yzJ68EdDEbBrEN3VlLhEQhjnxUu7HTsWYhavYCWBvygj1
+TFzhsY1uHDh3e/8w+PlY56xG4RkFoPOrjBVRF/rOSksifzy40yrSlvpAQzEBkbKD
+lhm7dgMz5185/8EqYGs3jzbRXmkXg1vi27VbQ7q3fghUR3fNspdu1PcDEUtu9D9M
+aWrrXRi00ux4eP4cnoSbmSUUayDJ4VfQAVNBw0+NWFeCU2cHQ/QFBXKhDcrUMpVq
+wxNXxbf2lC45RIM43rrI0s04nGDE/Eh2hGu2tELuoKgdk/ZpoEd+erP6tp2vIEpH
+Ex5QLkuBKy5ia+ExeOP1zg5xINjVappiCYm+dgsJONw5k8KhAt+RlQUR3F0/+Tms
+Z08BUm0/YW1+frwN5KWZp4FWrtP8q8MDRLLTb0Heo5pIUYnyZhpT42rmis8p/TlN
+QaiSPKMFcQAo4tbRtCWFC+uCUZUQrbahGAQUZqhgh1/lJP9i0cpdwY+qb3b8+mAD
+iAHqq7tYLudk4suEqBz8it7w/bJ92pCb81IxZBE+vnrvDL/MVnGzzWE99WGCIHzu
+nQnGBzQJzvxFw1L57aC7
+=nJWC
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild b/sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild
similarity index 83%
rename from sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild
rename to sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild
index 28ce08794d3b45da0d02f68264b64c934734e1d6..8ab6f4cbda6aa09e5243da6fa1d60a00867a58d1 100644 (file)
--- a/sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.4_rc5.ebuild,v 1.1 2014/10/29 17:28:15 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/checkpolicy/checkpolicy-2.4_rc7.ebuild,v 1.1 2014/12/06 23:25:46 perfinion Exp $
 
 EAPI="5"
 
@@ -8,8 +8,8 @@ inherit toolchain-funcs eutils
 
 MY_P="${P//_/-}"
 
-SEPOL_VER="2.4_rc4"
-SEMNG_VER="2.4_rc4"
+SEPOL_VER="${PV}"
+SEMNG_VER="${PV}"
 
 DESCRIPTION="SELinux policy compiler"
 HOMEPAGE="http://userspace.selinuxproject.org"
@@ -29,16 +29,16 @@ RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-       emake CC="$(tc-getCC)" YACC="bison -y" || die
-}
-
 src_prepare() {
        epatch_user
 }
 
+src_compile() {
+       emake CC="$(tc-getCC)" YACC="bison -y"
+}
+
 src_install() {
-       emake DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install
 
        if use debug; then
                dobin "${S}/test/dismod"

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 46f075d0657c47cfa5f44d1731e8275e38e5762d..76db39aec3456f58da3af0f228ef028b070b6f6b 100644 (file)
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.146 2014/11/22 12:59:49 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.147 2014/12/06 23:28:23 perfinion Exp $
+
+*policycoreutils-2.4_rc7 (06 Dec 2014)
+*policycoreutils-2.3-r3 (06 Dec 2014)
+
+  06 Dec 2014; Jason Zaman <perfinion@gentoo.org>
+  +policycoreutils-2.3-r3.ebuild, +policycoreutils-2.4_rc7.ebuild,
+  -policycoreutils-2.4_rc2.ebuild, -policycoreutils-2.4_rc5.ebuild,
+  -policycoreutils-2.4_rc6.ebuild,
+  files/0020-disable-autodetection-of-pam-and-audit.patch,
+  files/0030-make-inotify-check-use-flag-triggered.patch,
+  policycoreutils-2.4_rc6-r1.ebuild:
+  version bump and ebuild clean up, drop old RC
 
 *policycoreutils-2.4_rc6-r1 (22 Nov 2014)
 

diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 278226ae8c8ba852750a9489ebf9efd0fe5e3a58..1d4253ae0565162f60c2a4af6c24fb3795b9ad5d 100644 (file)
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,8 +3,8 @@ Hash: SHA256
 
 AUX 0001-policycoreutils-pp-add-roletype-statements-for-both-.patch 2157 SHA256 799b93fde622a168e0c7b1a0a1ec1a0a65873379e1245ec42859c00a06ca1372 SHA512 fb96bcf8bf045092be98dfce3c2d010984428f2a302e53c72af236eb1466465a27c6fba00e0912cafb28159e3d233fd82220c2456a2b8df36ba2d1286b9752fa WHIRLPOOL e1a829e0710e045c7a7ba622f4c79e8ff9d59c370b838e45ccca95416845d92a6d690cd65be2c99aa020ec7a6db2692988db7b5d72823d42f977124b35abcb17
 AUX 0010-remove-sesandbox-support.patch 747 SHA256 af6969721dede49f4de4e1db8e98e8400a8f0e3ec0b55aee9295aea0d6ba3b9a SHA512 b7b54191d2b8703393dd23a7fcccbdc3e2b7234acd962e994c8549eebae6cae3b6f62055b47a2d5db94510739abfb2fa365090c452422b6fbc02ad625ebe4859 WHIRLPOOL 1ed396c3346123af9fc8a5e911a6c241e2b64d7424b2d5194b0cc7c6b44a960c70afde3d04a508ecf525af038a52c739bc424230db34fcb52096304b2cda2771
-AUX 0020-disable-autodetection-of-pam-and-audit.patch 3905 SHA256 0ac878dabc3022cf1e910259d3f8d29c272df93cab71a9f70c06753eeb77d477 SHA512 0a7bd13a2329767e554bbaf2bd86c26bb2d7f13efb646b899eeb97425f3d28f590f91ce766dffd2111d7868b3bd811ec24bbfae4d5f565443302f1570a0a27fd WHIRLPOOL ed89a6e47b8dc8c9faab2ed31a18f39930f159b032dff4822bce5ad7c61a3fa68ea06d76849b51b086e2afdb4fdc21992982b901aa40a1f7c7a364348fe8e060
-AUX 0030-make-inotify-check-use-flag-triggered.patch 647 SHA256 acaa078e9f4b789ca573cac13613f10067d46fa0b0b30fa0aeda34777f71bff7 SHA512 e2568e802e5e4ee237c3a6484528474e77b538d739f304de1efff34b52efb7219d7db52d6e23e5c6eb0b731b31ac08357a0c40f8669e06118ace3a30d516596e WHIRLPOOL 27e73f689d46f7a69458c42a39360a641605fb0905187705c8868a466772b17ff65660985d3f54b6883e28a96bdee687e14f381243aeb41cb4030dfddc0daec7
+AUX 0020-disable-autodetection-of-pam-and-audit.patch 3924 SHA256 5f322dcc8c24838ec30c1df3aa69876063989fd07389c60ef64802c6fe25e91e SHA512 0efcbe36fdaa369cb1837767e872189f9f18b58d738b38c304ef31c568e60d602cfb5f87328a3b1f209840e2ab102f2d0ee8c4e918b2866c0ca978f33252ad33 WHIRLPOOL 669a451f98f39607e6a5a235e67ab432e480327dfe8204c2fcbb7455f571da4a64e91d76926c34e7fc25cec393ed6fbabb33e46c00e4f7a30848f304ed96b61f
+AUX 0030-make-inotify-check-use-flag-triggered.patch 650 SHA256 1cf0d985c865d9afe134e598c50b40420e4a48f4fde6e5d1916a880b8c393a75 SHA512 9ae10652ae14abd8930690363d41d9cacf0d0003ff21cf75dfc52a4ab7a4ab3d1fa9f1dc6994de9ae874483297478d79ee071dae766dfabf07ba70092bd11ba4 WHIRLPOOL ebf776adb8115db80418313ee8ad80f8d03b71358b1aa790ac690cd81b3646f0818da6bbf5d2f570c4be4150e6a2b475ff848622239f65e1479f29c9eb6a44f1
 AUX 0040-reverse-access-check-in-run_init.patch 500 SHA256 5e1bb9b3124efee30502992cb16720f44d8abd3eeacaa8b70cea5cfa116dc9dc SHA512 2935f303a84f5a18d58eb98bab2101772d6b787a2fe8299cbba1deb0dacc313ae04c60bb731fae255e24c52b5923aa861925c31be8898aa37d2d7687a7725040 WHIRLPOOL 3022f8703ea851c2b90e93965dce0669a2d3b33ef61ee09ed9aed775f07858c6b5474b8e0f0e6186609af4e05234c042aa376ea242b4245a95a1cd08ba19cbd3
 AUX 0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch 519 SHA256 63d4952efdf1fa8510485900e17f3bcb356086dda9440e3f4dd9fbcad83ec027 SHA512 c49b440ca07003688e115ea792188f37e5456d8afde0ee3be7a49af8c51ca7089e85e64ad237fbdc3c34685a58022f695f00fe443face1052f8181829678a256 WHIRLPOOL 1a246957e0aebf5129117644eb202a123ae8e43cca19b961796cc3940253e92c479819911a681d2434f794693115843cf351f04f9610e46171bef7048b59a8d1
 AUX 0110-build-mcstrans-bug-472912.patch 2509 SHA256 c89ee8947ba7d04c7df30eef7fee91233188da90718c05a93c07112eb272dd8d SHA512 97a6c17e8232dc62dd5beaf101efa1e0462eedfb9fb4eff93d96171bbd866bd12b19ada1c512eef20ba732813e6f009276debbe5385ece373dd3bad1b7e61765 WHIRLPOOL fdb2509aab5e98ed11a942457711132e5888a25c0426bde59a84fb8bd8dc3f065f0e6daba77730e94a114c1e1431a1cee17a6ccf305946a5abed328f027c0bd1
@@ -13,35 +13,33 @@ DIST patchbundle-policycoreutils-2.2.5-gentoo-r1.tar.gz 7287 SHA256 cb6915c46a5e
 DIST patchbundle-policycoreutils-3.tar.gz 7294 SHA256 44db261c87f583a7620690fc5041d8a21b1c935e741fe7b594aa2cc958e3deb7 SHA512 24e4c73e97441a1042618f6a4179d71672c81f821ffc2f97a54116bf6b33a93bd7f3e2030dbdb362da5e2a7d8936604e5b0283261c7b2447cc4f7594966c73bc WHIRLPOOL d38416ff9707d7d2bbf04f5d582944a87d27de06f3d70677341d38dacc6501dd78ef01fd8a7bb044d49b1f2a8c95181e2cb1b4b81dae49819409dbcf9d7abcb7
 DIST policycoreutils-2.2.5.tar.gz 4948944 SHA256 bbf850a8c3c2f371f439d6525663eecdd3a737acd594d2f27f8d8f3a07830cc4 SHA512 88a32fbbede56f3e717394f134212ed9df9b06cbb5532168ccc03ef2a465f4320b54a561348ea5c319b5b641f7661565ad29fbdc5aae50190a6d21d076cf2c3f WHIRLPOOL 0eb0e0c7e1fc1514cb28bbda7a10066ad23a9ccfecc92dee606e3f0e71632e07fe1c4ba7ac89993adf15e9520fc9e527e16d623d56b4e96cc882bf82dea4cb14
 DIST policycoreutils-2.3.tar.gz 4984980 SHA256 864cfaee58b5d2f15b140c354e59666e57143293c89f2b2e85bc0d0e4beefcd2 SHA512 3256849d13856ec47ac85470632a57e26952c5dafffb51df4eb8e32467196ff3ef725cc582798727fe45fd6284c1893d12eae2c89088ae1758ad39faec385659 WHIRLPOOL 1dd9bfd67ebb744b8c47144966f09d8361e9018e8d941355080c274b9ac891c18eb95771f3dc8b136683224bc5f12f3fb58fa00666b5815d65e7141c31d9293d
-DIST policycoreutils-2.4-rc2.tar.gz 5000679 SHA256 31efaa1d05e8fb50e094417e265dc0a125863e358938df9a4e19718d119af48c SHA512 a27b4bcf0f5cc077b03db9650909b7badecdd4f317ffe3dba0f7cabb9c5fd77a28351189616506d1806ed6c6b43577c3f16f306d157cf64c08827826c986cd6e WHIRLPOOL 1cb2f4f2f8f3339ff4632bb23f9983ab33390036e613f117004f0e5fcd16e1a04c834a7f4032295e9cb47bde5d43275647ad7bd19daf92fa96d43f69d62f1e28
-DIST policycoreutils-2.4-rc5.tar.gz 5003770 SHA256 f3063e732f29f4dfae7983e5ae503b35f1dd058bbdc94c2ba0b363c502978e3a SHA512 1b558f502833723ba7a1b7126a996b3498ae65f8452dc02a9313b5111b73d5c8854366698b23e489965d3de63d57820c822b28a53fa6b833c967e28545cf5955 WHIRLPOOL a08bd959c29daabdec0b3d3e0775b54e9b76ead45cfe5a4836d3271f6f8fa9ef37ef411f75df52cf85c306f119f94cfc0cd3e77f3bb4e6856012513b78485f6d
 DIST policycoreutils-2.4-rc6.tar.gz 5004643 SHA256 192efeee0e4f83c2aca59b53e7b4b40bb4b5980d9dcf95b17b544e244a038316 SHA512 4530f5b138ea30c2d3f033bad70fb31be54957b83742cea587c76756010669011c862c9c4090d52ea8ba9f3ed9a3e31cf6ac306355cfb12dccb4aea576a758d1 WHIRLPOOL efef6bf91d04a0c07091e4a538c23d1e11cb60e593592519b9cd880d6df4a98b7eb1ae13ba671a879cc7a1cc6460829f8b99665663cb04f9c62d6def0cb51716
+DIST policycoreutils-2.4-rc7.tar.gz 5004811 SHA256 2842f089b0c407e7e691a8bc2105563c4f32d68b74be07fd6451c825ab09b086 SHA512 b16240fd256ac1e89640c80f448feddfd327772d985ecb3daeee93e250b2925dda9f40b7136d392b43a9a5aed712c757d48fd646cc81a35c7a5f53b2f084a498 WHIRLPOOL 58f3ea5cfc93bf1cb7e17344042ea6d5bc48e421e0e1ddb0fe59c52405f08fb75692423104234068471ee4d98427d07e3a298ff9e40bb596067823f4fa718604
 DIST policycoreutils-extra-1.31.tar.bz2 16080 SHA256 ad0a78d96fd01aa51fe774e1701bd23934cd72182b2bad68112006f0ea17cc7b SHA512 520f93f1a2ce3c60a1d192b09cb9a968d207fbc6ab1f01861be95a50b65264f706335620ccbca48ce38f81581a4cf5128e5db9e5b0564460c9f05f04038abfba WHIRLPOOL 56e713b9bd8f1af1496f383f45f1ef8d373b3f45148237bfd28c016f4becaa87d932b363d165b46c657ea3a08503e7bc60b1c5a5a2a814a659770bedf33d4202
 DIST policycoreutils-extra-1.33.tar.bz2 16191 SHA256 743c3930277102f5545907314b21e98955e88be7972e30264c6cb5dca370b788 SHA512 3f6f19ae33d5b1043f2979fb3e79bc061767f7051cbd0981e5c5663b4391fa29544b2184b384c9fce7b4100623bc776748d77a01865dcee78b0756d73ee10886 WHIRLPOOL e74b9c3a6dff563b81bf3ce85119fbdfc658191ac063763f2916a7dcd90584f98cbccd1d6cd5ef3aecb00366a82c949c62ab9b907cb98800cb53d3e9ab63b492
 EBUILD policycoreutils-2.2.5-r4.ebuild 4708 SHA256 2287c153ef9ce72a15e1fb0d681942c79c26393dfa00436b414389334606b5e4 SHA512 d69a0cd51e9e995f59535e6e72a3e62d4a5e3f75aeb8a98f9e6dd6ce7f02b4ca19d479395bcfccdeba7b932c484bc90308a3f563d621c0f3f626c4aa5b927c5a WHIRLPOOL c34a44c55bc221274f3f19e8f72fbf1d649b16978d6d080ff66ba47185b0bc7e069431a818ebce1fd23ef590f656fa23e86ebef42bca870050ff2a792bf20072
 EBUILD policycoreutils-2.3-r2.ebuild 4348 SHA256 46b1814453fef44d27a90c818d4948e5a448967b5b3305f71017da9788ff18ea SHA512 8ac7acafb331a746ef03bfb016b098425cd0c6f25fb02b20c79f22d4f82a97cdd4c272f27a289a0172b375002a6a3bc3f1f4e4b2f27d6fba52a7bc26819ff8fd WHIRLPOOL 41bd78021c5ac52e4778d5b0648c8af6f5e40298d71446486e2b1ed5da9183c4b8b337850b59f1a275823c536b4eb22800dacfaf656911a5288d61ae65d35d29
-EBUILD policycoreutils-2.4_rc2.ebuild 4638 SHA256 c0f8968dab68ec2416d57d2f9c108c4b1d3022aa4a86b898b66464cfb40d4dd1 SHA512 f3752c8dd9d17dd4c63167017874bca10c89aaf212d25a4ca6e1af40c16040e07911fb9424e3ace8c36f97771fe900270b7fdb6c1770b470d5d59d1ed043b7ec WHIRLPOOL 950f86835caac5dea85057b262976fa7009d51be9bf6ae8ecfa2b32cd38c4a2cbb0db34c05dd565df399598fa76399608fc7301e32e60f62e3a0885b6d367621
-EBUILD policycoreutils-2.4_rc5.ebuild 5545 SHA256 58d31584e99055cb2d8b79bdb79478b02113f965ea775c160fe6590917d29e49 SHA512 9ca53f582efeda5ee5c4a3a126cb662c1b1b382601cfc98b1de4116f26a7622438d988007a9474c847ab90205779ec7aa628848b89123e73e5a9d39b4631237b WHIRLPOOL 4e1942ad4fc80b33309173645901a75fc7e66fd4b5343f550583f596e631fdca5343155d40a9b483350935b4c9634fdea7c991e0447498768bb665c0456dd85c
-EBUILD policycoreutils-2.4_rc6-r1.ebuild 5638 SHA256 f3c8208165b991d2da5bf33636a7e974e549050564625ccc105c1ac7e8c7ea49 SHA512 d2c37e061f7420f0d36e2270d21b7976b3b38f5728d37faa561923bd03897045c2b10f3553e234a770800d766d8929e5f6c3cf695bebb1cc0ab03b9dba872e29 WHIRLPOOL 836d39966304c55d203b34bd72786566704658316ddd6a19a72c4fa3bb360f68eaaf91cb889c75682381ff598b84c04a18c696dd7b3c007bacabd6cb0d76f05a
-EBUILD policycoreutils-2.4_rc6.ebuild 5545 SHA256 7e017aba8197f3c8e7774ff8f137c3b3bf64d8d85d417ee03a444929ffa27bd6 SHA512 9120dabad8c12a6af3862a5ee2fa564b3ec232a12d5449fe854e620f38abeb769c1db25c3a05dea3cf55ce2a305f58399bdb68d4947982e770b75adbc0cb7fe3 WHIRLPOOL e209082d76393122611b633e9b27f35825dd1cf07993cf7fd9684139831600cb3ab3884738981549d7920ea5ef3a88ed95b709c105a973a4887a644aa2a3d9d6
-MISC ChangeLog 25139 SHA256 83fa21720537a120ddd3932103bcc2c4240e87a4c81f765eab115c24095f5b92 SHA512 266aa7bfa8478926b05fd4683bec0729dcf24b1ec1657060565208687ce348664a4abb515a49bd16eb1886351b529a3345863cae5c056840414bcfbdc6d491af WHIRLPOOL e883b44769f19b7312be97d09f292cb473a585ecdb3446ac0cb1d9a911e1fd3e08abc1a7d7a30a8623e427df93380cc773021c2bb0b4068af27576517a190ff6
+EBUILD policycoreutils-2.3-r3.ebuild 4390 SHA256 25dabdf0479eabeb1a3533596a7f6543e1429a98ff6076794a9c063de9364338 SHA512 7f81c1f4cd7de9dfd034b5050d6a6caa49703e7116297a68cf2ed5fd730b0bde235e8c4240eb762e190c3ab5fe6ce47dc68615979b12a465e56a415ac467ac0d WHIRLPOOL 122e8073ba02deb3edf0aa7c78ce9f87463114ed6efc40b5585facbd8a0de086a6d190b0953a09c6b1c4903ef3d3bb4b03f8b25b6903505c890a072a3c6a7ef6
+EBUILD policycoreutils-2.4_rc6-r1.ebuild 5658 SHA256 d1e1140248b4b7946b55ab3fc5155d92fc7b02212dca63a98bf25616a59a98d0 SHA512 8a2bc4e2a7ac90b6a5874d54c70e354e324f868984b46e38858da75a32b98b8602b62455f0d23b188ae3130be258052606989dfaf25c7a18c8ec2396ee2fa276 WHIRLPOOL 94554fef9e727d9c6b2485d2681212199dd374f4a64371c604f096988874c862c98b9ea461c0e87c5d6dd5db52f70d8a0610240b564549b756381765199fea73
+EBUILD policycoreutils-2.4_rc7.ebuild 5126 SHA256 9e21cd374e5580060128f7aa9ad7419759c43c253789e2ac051d86758c0ab94d SHA512 0734b373f7b52eb7ec27a940203c9dff21b3aa95a2c13f4686b638a42c67925dcc92a63e655480359bd53ea85e5f956d64568d686d87bc9e1999a324279af828 WHIRLPOOL f053ec1d1a5a7e48afc127d207227c1dfdb8c839067b2c4bad8fd188b9156600cf954b8a5b42a6c359f8c035624d4c6863fd8b1653261fca60ea2fe882a2c6c4
+MISC ChangeLog 25640 SHA256 53458156f91df7dad3ea43f8a9615ae5946ae0a30a2650b440a27264950cf3a9 SHA512 b86042ae46c2359c73e5f792582a81545f22589d54ffc184bca09b5238ca4d2fe860f56d96b14b02b40aeab63f501d79983fdd337cace8cbb01ab36577ed3791 WHIRLPOOL 7dde275705460c9364959d200f7a055438ce97391ea297472ce717a4685c335703bd4fe3997fe2515bd4fcb6116d873ee67fa997b69aab746d0a874e68c73ce5
 MISC metadata.xml 971 SHA256 9d2157deddd1a457ff3d7b1232ec23e71367852b743ef6b4b8290349c3c9c698 SHA512 79fbbb6285a75f84fdd103ed704d62ede2695e7b8fe03f989ac4a065261a5e870675c1186173c1d4a65b88ac98f8bc2153146010513926e1a1b53efa52564a03 WHIRLPOOL eadde5fe3a3a2a71031d46f7e7c602f8069138914e62c44dff4be09afb8e23391a36d7c358a011722151437ee51be9f404ee1360a2d918078de3f783ff7e062f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUcIjMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUg5EZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VuRkP/3m+zfc6TTX96ugc2Qzlf/pG
-jDvg+0wmd16RFJxle4TTySdBltp6eA78o5YNC0zARAiXtdqm5Beiakj9RmySIwTT
-f4FGg7DJoGP8SlMKgiw2i1GHMQVqNzzii2G4/d6s3kRh4Xnl3K71AOS2v6xar9c5
-byIQPvSDIxkbDYjPRnPcipYn/uGGas4HpGqQaNvC6hy51A4pnsQSSM2/TDrDHrSL
-LYzhBS24mrzK+s5zn3+2QkEHC7JuaOkbJ9F1AL68hgxNam95YaazasOoaQnnmIza
-1+VVU+GtPdHFKBT80V2WCy/qPOEA0SAaYdi6/+GWPyzUvyLZCsBnrkgxgdYhUQHG
-hRuaG8FIYbN7EfCmNcTAeUSTRHCkhq+7f1h34DM/ckSkLYlSJsjRjhl6m8h39Ke/
-VZaamJREed596/PEbvyfy3zdLul16+OnfjsFnvlhIV+6sYRHxuZs8wh+ANH7Ctml
-L0vmdhueWAMTBZvm3DMl0aX/81hyTcJU2XomsCtlM1ddaO3PhCSv91VBIAuCidXd
-LkSv06lR9/dZbw9SdfaWR5Vc2O2v6zzjRBE3Ymy/fQUBFXzF8deF2CxEfqocg+3m
-SHN/cHscJfN4OSTkIYNclq2dXO99V24uTYKO48S9zH+3DTMXTkpKXxKeP0fRmZ8B
-a7NxQXeR+zxG0MpDLDSU
-=cGXs
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VvIoP/RasBdeuDZTlha3MGDh1jjf9
+s3a9LOEakWf/8+mYfQTJfzq23490PUiL7/C0n/iOmo+JWFI5DveeVC7PGc7Ih+Yt
+pmxPsFiy2w8gL8RJIo3CgIa7YpBLONJBvcNLzrDkPCeB8xYK4iYef5lvPdKDNXqe
+dqwnawOp6W4okWNEOIJmN5jOgGZqJDOwjoBhD/0roaxV2mU9cQNPUzbzdoT1klvg
+inscylutmpGq/y+cbJJyD1el07q4Rsfskho8FTOIfSGEVGMeA5xgVI8VaWovPvZR
+eI5baMon5pkHGx2T4wjW2+KVg5cFWgbljOuw30y6+l34NqrLiR8w1Q9x8J82WKAZ
+apHqOf64FlXso9oAdU3Kd3sdPsoKbAoYoNSUzYsxKfQ8o4oRAwphwx5DL8wvltUq
+6bZpyQ2ogSMRm7gHKDBdDLHgH+MplD6WEOtTo/7eywp9B9jENyvyq1DhxBtg8pkR
+728LnEiVaI5NUNbVTlYWqoFHU3XEri5TiiJyoq0jozpCWuxiHzwXQBZu1Dw9LBXx
+pDFI/fcKrHZ0rBR7WNupNhOvz0SZjdSJ6tp17nyTMAbwBHFPYhlIFXhjbbPuEOun
+YRf8Yxgv123+KNsII5WgXogBYYxmZInu2/Zcr7UDlR/VcgnYp0lIl+oFJvZyq0Qk
+Dn+wILBW+mEX+/RPUXjt
+=zEyI
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
index cac92dc36ea1adca21dec7f7fbd78564a79e41e3..a3eeaed901d5326e333189ff82112822ad11c24d 100644 (file)
--- a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
+++ b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
@@ -7,8 +7,8 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  LOCALEDIR = /usr/share/locale
 -PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
  # Enable capabilities to permit newrole to generate audit records.
  # This will make newrole a setuid root program.
  # The capabilities used are: CAP_AUDIT_WRITE.
@@ -17,7 +17,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
  override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
  LDLIBS += -lselinux -L$(PREFIX)/lib
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
        override CFLAGS += -DUSE_PAM
        EXTRA_OBJS += hashtab.o
        LDLIBS += -lpam -lpam_misc
@@ -26,7 +26,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
        LDLIBS += -lcrypt
  endif
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
        override CFLAGS += -DUSE_AUDIT
        LDLIBS += -laudit
  endif
@@ -44,7 +44,7 @@ diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newr
        install -m $(MODE) newrole $(BINDIR)
        install -m 644 newrole.1 $(MANDIR)/man1/
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
        test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
  ifeq ($(LSPP_PRIV),y)
        install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole
@@ -57,14 +57,14 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
  LOCALEDIR ?= /usr/share/locale
 -PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= n
-+AUDITH ?= n
++PAMH ?= no
++AUDITH ?= no
  
  CFLAGS ?= -Werror -Wall -W
  override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
  LDLIBS += -lselinux -L$(PREFIX)/lib
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
        override CFLAGS += -DUSE_PAM
        LDLIBS += -lpam -lpam_misc
  else
@@ -72,7 +72,7 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
        LDLIBS += -lcrypt
  endif
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
        override CFLAGS += -DUSE_AUDIT
        LDLIBS += -laudit
  endif
@@ -81,7 +81,7 @@ diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run
        install -m 644 run_init.8 $(MANDIR)/man8/
        install -m 644 open_init_pty.8 $(MANDIR)/man8/
 -ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), y)
++ifeq ($(PAMH), yes)
        install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
  endif
  
@@ -93,7 +93,7 @@ diff -uNr policycoreutils-2.2.1.orig/setfiles/Makefile policycoreutils-2.2.1/set
  MANDIR = $(PREFIX)/share/man
  LIBDIR ?= $(PREFIX)/lib
 -AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+AUDITH ?= n
++AUDITH ?= no
  
  PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }')
  ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
@@ -102,7 +102,7 @@ diff -uNr policycoreutils-2.2.1.orig/setfiles/Makefile policycoreutils-2.2.1/set
  LDLIBS = -lselinux -lsepol -L$(LIBDIR)
  
 -ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), y)
++ifeq ($(AUDITH), yes)
        override CFLAGS += -DUSE_AUDIT
        LDLIBS += -laudit
  endif

diff --git a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch b/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
index d48d2548791227d5b5945cc7b977e96c5fec0a3f..6a31e255a952968c91338a152c0dd023fbaba354 100644 (file)
--- a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
+++ b/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
@@ -5,10 +5,10 @@ diff -uNr policycoreutils-2.4-rc2.orig/Makefile policycoreutils-2.4-rc2/Makefile
  SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
  
 -INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-+INOTIFYH ?= n
++INOTIFYH ?= no
  
 -ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-+ifeq (${INOTIFYH}, y)
++ifeq (${INOTIFYH}, yes)
        SUBDIRS += restorecond
  endif
  

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
similarity index 83%
rename from sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild
rename to sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
index aca9d8a524fec1fda11e2cc3dbf94053cfb315a9..350f0cfc72d1c3a94c633f5dbf96127d2c2f807a 100644 (file)
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc2.ebuild,v 1.2 2014/10/29 17:33:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.3-r3.ebuild,v 1.1 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -11,16 +11,17 @@ inherit multilib python-r1 toolchain-funcs eutils
 MY_P="${P//_/-}"
 
 EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc2"
-SELNX_VER="2.4_rc2"
-SEPOL_VER="2.4_rc2"
-PATCHBUNDLE="4"
+SEMNG_VER="2.3"
+SELNX_VER="2.3"
+SEPOL_VER="2.3"
+PATCHBUNDLE="3"
 
 IUSE="audit pam dbus"
 
 DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/${MY_P}.tar.gz
+http://dev.gentoo.org/~swift/patches/policycoreutils/patchbundle-${PN}-${PATCHBUNDLE}.tar.gz
        mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -34,7 +35,7 @@ COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
        sys-libs/libcap-ng
        >=sys-libs/libsepol-${SEPOL_VER}
        sys-devel/gettext
-       dev-python/ipy[${PYTHON_USEDEP}]
+       dev-python/ipy
        dbus? (
                sys-apps/dbus
                dev-libs/dbus-glib
@@ -58,20 +59,18 @@ S1="${WORKDIR}/${MY_P}"
 S2="${WORKDIR}/policycoreutils-extra"
 
 src_prepare() {
-       epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
-       epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-       epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-       epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
-       epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-       epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-       epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-
        # rlpkg is more useful than fixfiles
        sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
                || die "fixfiles sed 1 failed"
        sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
                || die "fixfiles sed 2 failed"
 
+       EPATCH_MULTI_MSG="Applying policycoreutils patches ... " \
+       EPATCH_SUFFIX="patch" \
+       EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+       EPATCH_FORCE="yes" \
+       epatch
+
        epatch_user
 
        python_copy_sources
@@ -116,11 +115,13 @@ src_install() {
        installation-policycoreutils() {
                einfo "Installing policycoreutils"
                emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+               python_optimize
        }
 
        installation-extras() {
                einfo "Installing policycoreutils-extra"
                emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+               python_optimize
        }
 
        S="${S1}" # policycoreutils

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
index 51018a520e0d2a054cb4c6d77f6b5535ab472c15..e37cc263a32f28c5816c9fc08f45301bb96f7a36 100644 (file)
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v 1.1 2014/11/22 12:59:49 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6-r1.ebuild,v 1.2 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -85,14 +85,14 @@ src_prepare() {
 }
 
 src_compile() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
+       local use_audit="no";
+       local use_pam="no";
+       local use_dbus="no";
+       local use_sesandbox="no";
 
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
+       use audit && use_audit="yes";
+       use pam && use_pam="yes";
+       use dbus && use_dbus="yes";
 
        building() {
                emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
@@ -104,14 +104,14 @@ src_compile() {
 }
 
 src_install() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
+       local use_audit="no";
+       local use_pam="no";
+       local use_dbus="no";
+       local use_sesandbox="no";
+
+       use audit && use_audit="yes";
+       use pam && use_pam="yes";
+       use dbus && use_dbus="yes";
 
        # Python scripts are present in many places. There are no extension modules.
        installation-policycoreutils() {

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
deleted file mode 100644 (file)
index 757ade3..0000000
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild,v 1.1 2014/11/14 19:20:37 swift Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs eutils
-
-MY_P="${P//_/-}"
-
-EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc6"
-SELNX_VER="2.4_rc6"
-SEPOL_VER="2.4_rc6"
-PATCHBUNDLE="4"
-
-IUSE="audit pam dbus"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz
-       mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
-       >=sys-libs/glibc-2.4
-       >=sys-libs/libcap-1.10-r10
-       >=sys-libs/libsemanage-${SEMNG_VER}[python]
-       sys-libs/libcap-ng
-       >=sys-libs/libsepol-${SEPOL_VER}
-       sys-devel/gettext
-       dev-python/ipy[${PYTHON_USEDEP}]
-       dbus? (
-               sys-apps/dbus
-               dev-libs/dbus-glib
-       )
-       audit? ( >=sys-process/audit-1.5.1 )
-       pam? ( sys-libs/pam )
-       ${PYTHON_DEPS}"
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${COMMON_DEPS}
-       dev-python/sepolgen
-       app-misc/pax-utils"
-
-DEPEND="${COMMON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-S1="${WORKDIR}/${MY_P}"
-S2="${WORKDIR}/policycoreutils-extra"
-
-src_prepare() {
-       epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
-       epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-       epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-       epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
-       epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-       epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-       epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-
-       # rlpkg is more useful than fixfiles
-       sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 1 failed"
-       sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-               || die "fixfiles sed 2 failed"
-
-       epatch_user
-
-       python_copy_sources
-       # Our extra code is outside the regular directory, so set it to the extra
-       # directory. We really should optimize this as it is ugly, but the extra
-       # code is needed for Gentoo at the same time that policycoreutils is present
-       # (so we cannot use an additional package for now).
-       S="${S2}"
-       python_copy_sources
-}
-
-src_compile() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       building() {
-               emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
-       }
-       S="${S1}" # Regular policycoreutils
-       python_foreach_impl building
-       S="${S2}" # Extra set
-       python_foreach_impl building
-}
-
-src_install() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
-       # Python scripts are present in many places. There are no extension modules.
-       installation-policycoreutils() {
-               einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
-       }
-
-       installation-extras() {
-               einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
-       }
-
-       S="${S1}" # policycoreutils
-       python_foreach_impl installation-policycoreutils
-       S="${S2}" # extras
-       python_foreach_impl installation-extras
-       S="${S1}" # back for later
-
-       # remove redhat-style init script
-       rm -fR "${D}/etc/rc.d"
-
-       # compatibility symlinks
-       dosym /sbin/setfiles /usr/sbin/setfiles
-       dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
-
-       # location for permissive definitions
-       dodir /var/lib/selinux
-       keepdir /var/lib/selinux
-
-       # Set version-specific scripts
-       for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-         python_replicate_script "${ED}/usr/bin/${pyscript}"
-       done
-       for pyscript in semanage rlpkg; do
-         python_replicate_script "${ED}/usr/sbin/${pyscript}"
-       done
-
-       dodir /usr/share/doc/${PF}/mcstrans/examples
-       cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples"
-}
-
-pkg_postinst() {
-       # The selinux_gentoo init script is no longer needed with recent OpenRC
-       elog "The selinux_gentoo init script will be removed in future versions when OpenRC 0.13.x is stabilized."
-
-       # Migrate the SELinux semanage configuration store if not done already
-       local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
-       if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
-               ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
-               ewarn "from /etc/selinux to /var/lib/selinux. In order to continue with"
-               ewarn "the 2.4 userspace, please migrate the necessary files by executing"
-               ewarn "/usr/libexec/selinux/semanage_migrate_store. Warnings about 'else'"
-               ewarn "blocks can be safely ignored."
-               ewarn "For more information, please see"
-               ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
-       fi
-}

diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild
similarity index 79%
rename from sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild
rename to sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild
index 4b6fa16912838838bd344cf93f0194aba77ee6a0..78885a25c04cae8b8cb81048deb3d08885c32511 100644 (file)
--- a/sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc5.ebuild,v 1.1 2014/10/29 17:33:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc7.ebuild,v 1.1 2014/12/06 23:28:23 perfinion Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -11,10 +11,9 @@ inherit multilib python-r1 toolchain-funcs eutils
 MY_P="${P//_/-}"
 
 EXTRAS_VER="1.33"
-SEMNG_VER="2.4_rc4"
-SELNX_VER="2.4_rc4"
-SEPOL_VER="2.4_rc4"
-PATCHBUNDLE="4"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
 
 IUSE="audit pam dbus"
 
@@ -27,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}[python]
        >=sys-libs/glibc-2.4
        >=sys-libs/libcap-1.10-r10
        >=sys-libs/libsemanage-${SEMNG_VER}[python]
@@ -47,12 +46,10 @@ COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
 ### dbus -> restorecond
 
 # pax-utils for scanelf used by rlpkg
-RDEPEND="${COMMON_DEPS}
+RDEPEND="${DEPEND}
        dev-python/sepolgen
        app-misc/pax-utils"
 
-DEPEND="${COMMON_DEPS}"
-
 S="${WORKDIR}/${MY_P}"
 S1="${WORKDIR}/${MY_P}"
 S2="${WORKDIR}/policycoreutils-extra"
@@ -84,17 +81,8 @@ src_prepare() {
 }
 
 src_compile() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
        building() {
-               emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
+               emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}"
        }
        S="${S1}" # Regular policycoreutils
        python_foreach_impl building
@@ -103,24 +91,17 @@ src_compile() {
 }
 
 src_install() {
-       local use_audit="n";
-       local use_pam="n";
-       local use_dbus="n";
-       local use_sesandbox="n";
-
-       use audit && use_audit="y";
-       use pam && use_pam="y";
-       use dbus && use_dbus="y";
-
        # Python scripts are present in many places. There are no extension modules.
        installation-policycoreutils() {
                einfo "Installing policycoreutils"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+               emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="$(usex audit)" PAMH="$(usex pam)" INOTIFYH="$(usex dbus)" SESANDBOX="n" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install
+               python_optimize
        }
 
        installation-extras() {
                einfo "Installing policycoreutils-extra"
-               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+               emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install
+               python_optimize
        }
 
        S="${S1}" # policycoreutils
@@ -136,7 +117,7 @@ src_install() {
        dosym /sbin/setfiles /usr/sbin/setfiles
        dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
 
-       # location for permissive definitions
+       # location for policy definitions
        dodir /var/lib/selinux
        keepdir /var/lib/selinux