Bump towards r5 (fixes duplicate context for hiawatha)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 36 insertions, 15 deletions

diff --git a/sec-policy/selinux-apm/ChangeLog b/sec-policy/selinux-apm/ChangeLog
index 165686e22f76..e38aca0cc789 100644
--- a/sec-policy/selinux-apm/ChangeLog
+++ b/sec-policy/selinux-apm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-apm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.42 2014/08/08 18:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.43 2014/08/09 19:34:25 swift Exp $
+
+*selinux-apm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-apm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-apm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 616cdb743db0..e38ecb1ae519 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -5,28 +5,30 @@ DIST patchbundle-selinux-base-policy-2.20140311-r1.tar.bz2 259943 SHA256 0444ad5
 DIST patchbundle-selinux-base-policy-2.20140311-r2.tar.bz2 265878 SHA256 344e9c6c9f4466cbe39c067f4af902c25bb17d20431e0e19521490a92f41d80f SHA512 54b5092791038f97f7fd7dfe0d6becc3070171b2b114ecaff38c904c1392885756ce201663004bf4e6621236a77045828229fe2c5de317ba63da59786a99f312 WHIRLPOOL 27cd3eb4a15098d156af22c9f61ba02f0784a2eab49992b3a27777b5d60a76b6bc04e2cca81729176b779628886ca1ce13d89f865de3aa7380f1c9ef7682d3ce
 DIST patchbundle-selinux-base-policy-2.20140311-r3.tar.bz2 268783 SHA256 1d2f1d090a61e96ee26c63ebc0d37d1aa7f7c826b2885fd28bde2d0c81a500b0 SHA512 ef3eb5143f4343675c6e5219c6bad1b5cbc3c885088c0389974d7106e8da949843e1504edcea39888d14a20a8d6cf4032e24fa5891e7fa678abf7d9c7cef3762 WHIRLPOOL 5c875dfb043c0076bde48a2f7f1051e3475316578c46688e2e94bd79e0130bdc9cc5719e9fb2e5c3bca52e97e5d4773546cec1ae21bd0a0d37b5a57ac4adf483
 DIST patchbundle-selinux-base-policy-2.20140311-r4.tar.bz2 272598 SHA256 86c4e0aae81adf76054bbb74dd19a19022dbc2139a6adfcb3710dd679e5aecd1 SHA512 81b4ee890baf01f1b55a70f46454b3f77a7dbbcd3e860e309162389a34be056bfe82d3fb9f7b843a8476b2b1fb5919d534402c2f06eeb9390b33b3e6745ca444 WHIRLPOOL 8a4503d201d465b049757764ca0c209b03b66ba2af8cb7e979354c2d35e1c5b428d9a1876a606a765702c50bb725fe4f53a9384bbb205f9f51ca28d59aaa9416
+DIST patchbundle-selinux-base-policy-2.20140311-r5.tar.bz2 274187 SHA256 5ce76d59d12a7dfc02352eb2a77971d76c5ff0fa3c66cced6318919571f04839 SHA512 7a9da3ab23ce6217739f4548cc5365f64def11fe19b6f3b2a304685bb54246d12856388043870e0f061f71fb2c8c45da72bf3db28ad6e70f397f5dfffe2206c6 WHIRLPOOL a4729aaeed88f7485fbf112de91161bf4e75fb996f5123133c22fcb008966acc7db98c7849dc4b076cb633d00c81deae85cf6b5f8c48f8c3c72c90bcaff26d71
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 EBUILD selinux-apm-2.20140311-r1.ebuild 375 SHA256 884dccb342f0a00fcee45cd4c0081ef0f992d789d384b42a7e1018adc8b27e32 SHA512 348699ca4185478db11314497757aa738cdfd87e02e6fbea1c7996fd09b88039b6b1b008b50f35e738efba22568427fc25764a805e962741bd37580981b02b41 WHIRLPOOL 00c535cf89f96ee76f38bf7a32af3ebd41f7c985ef291d4c066832953f05476e686f8ea58666757426d3a681f03b665d0ccd12f96b2846473f03c86ba093f82e
 EBUILD selinux-apm-2.20140311-r2.ebuild 375 SHA256 4bf56e1b2146f802d1b69d0bc84ceccbb2c7ecbcf9570ea4042ade9ec1b84c47 SHA512 e7e128122486e1393191c91bb853a904add818e8ed290718aa2d91ebd75a9b4c893b0c983d7939703ffbc0d7d9d2a1c5a8932907d1ad2ff8f48d06eae6d7a59a WHIRLPOOL 3134d8fb76af4aa52a773929d3c26c0ab5369de788c0311a31ed4bc46f79ebe7fd77e2fc7a60411577f28b44a426047623c17093148e083714609e606c7bd8f9
 EBUILD selinux-apm-2.20140311-r3.ebuild 375 SHA256 3e684f524baf9cd5c7c0b82c6abd21fd1a15da691e270448cee4e0fb447510ee SHA512 b7fa35dc74beb67f0374d306766b506e21bb9be86bd552d0b711ad5c13308f417daa0a59420f46a7d228f6580ef7e073fac712632b4130d1a1cafc2c07ac8684 WHIRLPOOL 530e011be302261bd7e7ea027b8caee148d5ee198fee5065ff6e23bf5be413432e169ea937c6bda9909e2727bd46456fef9bdeb33e94ab6188d18dfebe49c64b
 EBUILD selinux-apm-2.20140311-r4.ebuild 377 SHA256 a55a280fd9a567ccb6f89b47a7ae5db6173115c1326ee8144486d50c40adae07 SHA512 710be85bb69a8679f14fb1a6da340c9805dc9e6933cf90e9acee96d6ac96f76b82a9120010f3d143db28f23a01057f767a065719926864af513edd6dc3ee9b52 WHIRLPOOL 41f565d475e0ecfd4dffaab649d5011a27cfa2857317385169b684328b7d98b2c88319c02b6a757e84cda6a83cc7a98f380cba7837448a30bd4c86d4850421bd
+EBUILD selinux-apm-2.20140311-r5.ebuild 353 SHA256 158ddbe6cffb080a0db95e486ef370be188da820319dd04765e5169f230fad89 SHA512 e686859799b7955afbd792bc5338b651f812604b2eb2c05921bec2b6351f0d2a585a571b39f0f93a34bfc73f8081a4c87e42fc80f4d7d6247b0501cc69e1037e WHIRLPOOL 0bfe1bf8449e6440bd68485bc7627c14fea274500b8559f1bc6cf466a9553ab7c89a274d19d8de39f22268abe0e5a99f6917ed8e04d1156450345e5e4ebeb494
 EBUILD selinux-apm-9999.ebuild 333 SHA256 0e8cd7c47896e53f26390f6abd457a72e0b6f8decc33fdc8ce845e2159a05ccb SHA512 6682a1c6052e1ac53f241768ecc81f0c6666476f07c32068d8b7c5492d23d9c5ac7ffefe1679018f2132eb9cd3cbb009d569c2aca94622216adacf62dc2dcf26 WHIRLPOOL 4b286924259e40b70958935fcceeb3e97c41fa52063764ac92759598e40c7fac7d11358b7f92f879eb1454062ffc6b2efc240b332567000a5a1a5ee2d90658cc
-MISC ChangeLog 6428 SHA256 34a381d9967c09a23ddc449c7eb73ab3be9fd64b92846aa2fa420d0cff6a8121 SHA512 501d03b308a96f338c30210c63c6c07505bbd883c5c14f5fd22c16c81c9bfc5503f07a37032d753ee6c62279775b586b8a2cc1f5e8e9d047338ffc835a30a458 WHIRLPOOL 4f8afa6e530ce6703a0ec538f7a5a33a88d812fcbea7ca8f2aa9f508d841b16d0737f2bd65cfabeee0546ddea7c774f540ae1181ecd45eea582bc713d59627bc
+MISC ChangeLog 6614 SHA256 2b1c66116a8264f4b0f0589ee22263ed0159996270ff65a0d6694fad7c3badfc SHA512 1fafb8c311c96acec51d463772a0384f105e11ff735d0375b7baec4d53eaa00f3d852ff8f750da20072d050c3f4fe42773f82c95271f9903206b744148137823 WHIRLPOOL b9e0928c3212353613c126376b3380e2629fc47d8e9bdbf6e6ae063bad1b63ad670b4eb5cd22b533c4be85f4befd09845c39828a731915fee148ce30b012a134
 MISC metadata.xml 227 SHA256 c4dbecc1821489f62a7580d39aeb48363c52c461f36379195e0c58d63a3193ec SHA512 96a4321820c7617302229ed3d2a5b87bfe5df36eae1905e0bc632b9c1692f515002815e2134cae5b58adc396c713ae41b133d31eb118409d46575103a68f64d8 WHIRLPOOL 3718019d5534a91b01a793e3a7c2f6b4434f9525f804e5558b9763e7b65e87690b094424f5ff0de0e6e5b7f80f6c6f88ce64ada640a58ca2e7c3208584c7509d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxYAAoJEC7dUkA7aK9HJzIP/iGPuVo1n1831vCJ98bxIExC
-vcHSROWVmHRHWNfKTkyqZLin/bFQjOn5OrU6bdOzJ4iQ0+ys1BZZvxCFIFWPbVIm
-wh6tleL6owwH/KpExESiWmiUH3ZsSY8nzytvmSh0ybJ7N1SXWI2muBHp2wc3eFn2
-Hp6bd0alWuQHab4BAzCgJHiAjuZk2GpYig95DwjA+DmYLI3mSSoIxDQQF2W2biLg
-nIlafA3hMX09S8e+scBrmsXclfXI+ztZ5FqVqbPlLXVKF8+jVJijk/8Aq38Tn8QR
-yjptwDnmIz5OxfNmJxPO+OdRYcSa+z/sTDv4EftRtNfC2wgWXG/r8esbzs9BIVDW
-vgBxNWgHxctHE58w0pE0bTdHjYWWzXPFcMcZIrs1mWlhwri+axUNK5VovAgLZRPX
-Wik2Akx0X9FrI+9d+mnVqUcXOGOvXv47H0tHcbEVu3+UXRxem6PIgBiY7QurV/PE
-avFed8y6PsGHkUKhmj+qI1o+jCF1SfbFyuzWYnzFjEu7AqCbQAZC5QRv0qSTdXUl
-vcEHpdqdq8Onn9+7VgR1Cjc+I+iV8EXSiABo9OFabjFPXII8T2gd3DIZgFIa5mdm
-sPe4lt3CMUnfm6KE78AzXoQzkBRV3jqeWwvEORV1YeE9AgePmV3Ht2rhdBlMg9P2
-sSnpIiDskxam3G3qsrHa
-=CXvk
+iQIcBAEBCAAGBQJT5ngqAAoJEC7dUkA7aK9HqkMP/3NSICh/Y489MMcHjVwYPmyd
+VxOObyrPrbRbSoUlQG+WRjWnlh5PdcRAmXjXsJDKLKj/QmDIMwOEXae5nnkg4nzT
+ZsmLE0YjM85eVbB4gJAZfhLLd3VaqEffKKBNBavLGeaBEe8rUq6kjXFP2ylxeyBD
+14R9+40JAXXVkHlqSJRb2FrthZM+RtLNPfMzic2suZpm3QOgTKtu6qhzzGZAzZYQ
+FoCyW87j3bJeHpGkC1Ci9QGitAcP8wH0oKgrRhgFdse+Jk9urmxNiHWqbA4Ta7ml
++Rs0YqRzpKVV28a7vQHkf8vRc/GlTD1flSPmnZHYGi+zm2Nx15pefAXnLk5sjTYO
+v0juBwj4TtX9q6NHXtGbwn/DaDe0jtN8y719zQscgQCInUeZmgCHg0GtTSXnJspj
+YnzDfjroXE0i0His5rqWMcxOTzuK2btdURWAsU3E9i09kJ1UfpfxiXVNcrKFaSCS
+Bc/8qOBS48BwnWvzYf5pg/NzazgMmApph80xrxtssiJlbsghzXSaeOaa9NrVI14w
+nHnLXHBjPQl2RQd9fOfx/kGL8lM8e6TfINssVQ3iiqXdBMw8w61g1oF7erWpYmB0
+DUGvyaCMhVzPo82RLD4WCPkkKhZaQBGXOc7luRxNLTH6bT1I6DMsX4bBxEMXOpAW
+IXAlN01NLoPPRObBaZ9A
+=x/sP
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..abfcb70ae843
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/selinux-apm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:25 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="apm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apm"
+
+KEYWORDS="~amd64 ~x86"