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, 40 insertions, 15 deletions

diff --git a/sec-policy/selinux-nginx/ChangeLog b/sec-policy/selinux-nginx/ChangeLog
index 73cd9af7de01..59fad807e326 100644
--- a/sec-policy/selinux-nginx/ChangeLog
+++ b/sec-policy/selinux-nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nginx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.42 2014/08/08 18:49:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/ChangeLog,v 1.43 2014/08/09 19:34:41 swift Exp $
+
+*selinux-nginx-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nginx-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nginx-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index e65581cca333..638a795eecaf 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -6,28 +6,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-nginx-2.20140311-r1.ebuild 450 SHA256 d1e13c4e523bd293c210633bab66d75c4a61dbc9bf90f5939f8aef8cf5d8a33b SHA512 d01fbb36e6e29df5e35975e59e73236a350655c3f0bbefe01e00031656a1200cc918c8344dccec873d1e6c9e6bd47c5b6fe88afed7ca7e7269086610123d1978 WHIRLPOOL e7e0f3e368c995bf3bd5738c93eab9003b1da0c78bc92c7d6269f0eb6ca043b3483914ee500db423e049b76d5de47b033867a590d31cad2e7a52fa1592e653ca
 EBUILD selinux-nginx-2.20140311-r2.ebuild 450 SHA256 a412f50793bdd41424b803447e10237e1f2c37fa7a524c3902c685da52669b9c SHA512 3b940b773b24552c7570c2b3219014f69df7b632d651b021924b6954722ece7a41fc993e908f93c7ec2869d0dfd42b4bb642c4269e8ea0caa2e4b6b640813f9c WHIRLPOOL ed264b34c52a46eb801c2a06c6126d96bdd2ee69bbf0c512fc36be387eb5a1f3a820241b09f356da9a8a4afb08a54643bd4364c785ba547c61d252117f5f8391
 EBUILD selinux-nginx-2.20140311-r3.ebuild 450 SHA256 0ebb0629b5b7d444f9a97afb44828838d4111cac13cbca0a88ab155bfac5a1af SHA512 6dddbba89070782bb29460104e96b214e07f0d8e63d7400075d1899b3aba15cba81d02db79be0250bd4c18a0c383a694f654226c0c10072b358e46912f4051f4 WHIRLPOOL b8baa74f59e75781d4cd6944977bbf845b0f631f2c3058c959a3a49d9f39d3e04084835dbd41bb6d427c1e6501eff530869fb80656f395c07f34a8a06c6bd8dd
 EBUILD selinux-nginx-2.20140311-r4.ebuild 452 SHA256 68749d28eb1a68c9dead973e7a10b0f86fe0924b4b7d9eff4c8cb6a994695a36 SHA512 45b439d5c7193846412df3304a67434619297a2b4cb5fd3067815ba0a139e585eff1d4ad97a8f0098dd88c4f61c4f11bc86acf94e3801bf85bffbd3208e84e85 WHIRLPOOL cfba86c96a9c9aa6f20dac633a0948c685e925a9bcff9744a23c506f2a06dc465e5f9b2e79aa5ec6e87d867884e87306f42abaebc4faa5fe29608018222fa6a1
+EBUILD selinux-nginx-2.20140311-r5.ebuild 428 SHA256 060eb813a40dbd1ab2ca0e0c3797842775a7756d08a8f253c477592d9c0be696 SHA512 b93f3d7b5f454af20d54a4bb34130bde87c9287dbdb10e322d0fc050a0f5069768c279dd69348e3ba60dd8b9fd07d31618d06344381032f393773b71ec987fe4 WHIRLPOOL 1d1695a3cd06e2fec3da5b41121422f431a2180e69a0ecdca701ee0399b4d8e50dd26aba079a3b01e152077e84bca3211ee3820a1bdba2c1b1a7b59508f14e26
 EBUILD selinux-nginx-9999.ebuild 408 SHA256 7af1bb82850715ecada93b00f6033c426e92ec18463becfd9385970df228ea58 SHA512 0543233f8cc5110a9f8f5318e3db8fb98ac63fb107f5610cc2edabce3e055b838cc5a1c330ae37a90974aa9ecec98f1ceba83a3b4df9c54d0a2712ef77f874e6 WHIRLPOOL 1795ecea56ee1d23e695cb25fea7db17d05f44ad84750593c5848cc2f0f02b38ef841c3f50b63ae50f9f0a288d0ebd7624942dbb7036bcf34603bf89655556f2
-MISC ChangeLog 7239 SHA256 01b04d065a8613b62399f3f52196097c144cda6ba2c5aa782ea0da8b4a4b6fdd SHA512 e96eb882277ca5916d7c7c16e32bd1f98aeb5adbc0def51a3914168594a95ce4b2553f1bc26fee4ec8c8f2092e4a03825edc586341046b6da0bc03eb10dfb748 WHIRLPOOL 9b8caadf2665c5d7d33f72e896b9b5c4e3a4edcc8f9c2992ecdb54ab01b441d586f049476f74a1bff85ca1f57f4fef835189f2444cd23f3c0b7b2ec665b76408
+MISC ChangeLog 7429 SHA256 1bc69e5236fb8886a440bdc5ffbab60929ce7104eda791557412f9f204ef1a6e SHA512 4a7ce275a2f61ae967715bdad4ba31c743c4205468a1e41cfbdd456d926a1da7b0ddc336bdb592bd5e0100e0d01a30a467091c6a904297f6b6e8d17466ea9e86 WHIRLPOOL 8d2c71eba0bf8c3ee743afe06fd0c0102086ea2c939aca0d1439b5858a5db622dd9af40d69d9547ce3ecb0c9e52b9b88338aaff3ed512422d5a9f06f08769cc5
 MISC metadata.xml 229 SHA256 1e7644340777e25bb60cd52e7aca1e5fdb93ed30c315f78305d783674f11399e SHA512 ef9c989f7917b3e901fd87338890a336131abc95e883c2e212de874e864412df5597c0dd11482d2a9c23765c6a6482a5bcc0380d5313ac111fe9b08347eb869f WHIRLPOOL 52c7d9291b8e8ee5e7f32d479289ec6c3926930238056bf4c0e42f24afeef93d67bf8ff3826488a0afa0794697668fc93425dbbf4bb10ab00e22283d17453b71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyFAAoJEC7dUkA7aK9HM9QP/19VgV1xIJ0IJjEzmIxNunUg
-X/wcNy22ThPO5GzdVrXhnq0rvcPwj2Qf6QfRVmxylAqSU8ouqLxv+fKUVMkBEPaI
-UDkhHwR6Jt10vvXoJW7J/UMknwrnxTRamHW29IjennOK1Ul66nBF1v2FsuLMYk48
-OiybwmB8aoHR4eg0QtSZ7pSPVFMK7DGX4+IbR7hNXJErPKQUXc9SBwbZ5x2WdA8/
-l4JiyRrI/RD3wLFGj5ap/hdBQ5nFbF/Itj8xTbq+F7j0aCPcv4E7qOTCbbFOhUJS
-CeKjkJypKioyLbi6zReEPOFTrj33EXco/JVpqNyVs33YzHzDcfI68iXq3wxQuaX/
-ppx/U17n8zPfU1UHlSlB7rxagn6XMo6yF4CG8ODYnHnLW5Pw74kF724fDf3bAACn
-vWe/mf5JkcVSVtYAKJSb17yNtHETbFZxmOT0CqibCiJnYvwBsE9PdHjHCdb3Ug0i
-bZk12r5DukAsN4fB9R5u1Kpu+cBeRRejn0uiCcOHMOdjpdkviDaFHHWFNIdyUGSI
-7cEDkCvcvU1TYrbRkG8TXzQTXgB9m2N29LLQ6Sz8HqHg2UpYhK1ELUrCdzLZDUp/
-fay7mryk2W+wAuoKJJw1izH8qiB9IC8sxYb/FupLGCkDkxD8B3BwuQE02P81woQK
-nd/iN8ITsqYiTxp6PgaH
-=UunZ
+iQIcBAEBCAAGBQJT5nhZAAoJEC7dUkA7aK9Hc3AQAJ8HUHrYQNRWjTut9SNm5V5D
+PuD+AgCht36IsqxxLutHum8UofS8D3DU1iMJEaPZJFjD2r4kSrQ7fEVMGIcbbvww
+0iyf+PNMT/9mZBwaSmWKoiZywykc25yzOXhSVzLa4d6GJzehfpxL2wAZmGjfleu+
+2ibSRO3KAs4zlPYLouMaZP0l9c+n+WmEr08LqnAcSnXIi009WnWKbhUTLC1A4Gu3
+7srNSfNkRTM9GCRe/GLkQc2DV5AvRb1871K27JuEsFS21x8Ktj8G7WBGrGxXMf2X
+k4+uKHPVwGhR6n81z7HU8EBFQXuJV4h1T1qFjkYBkhwy+TT5nzxUL5nPgYmPzUPz
+9Jar8Jc8Mn0VZHVyHOnLvsB94Ja7rC3K2avLuKBsuxS0n2Gd5e0s9oZ/ThG1WL0c
+53uD4dtU2xeY6bOuD/BLgebkNdQUaAorWoG/7TV0PR2OTTAPk3l8+EYATVhF0baW
+9b/VRJm5d47TotbnG3ZeJulW3iQNl7JNPy09tkPnyc9EOvlRQfW6Ebf10k4Sk/N1
+kc3Co7kpd6z7Rwqz/ApuZR2+BcRh5tGHSZObRQFvyKYdEICxNKpo/XwkbvTuWE1T
+nVXdophP661DuBTlaLnrFmCck9W5UfcbxfEZsZIPH9QQkH53LS0NOpW0Xl044KLk
+TQsAkWhFuJNkJZguZ9yt
+=AfoU
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..7ceead1e03b7
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nginx/selinux-nginx-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:41 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"