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-nut/ChangeLog b/sec-policy/selinux-nut/ChangeLog
index d5faa058b7bb..e26e564dd86c 100644
--- a/sec-policy/selinux-nut/ChangeLog
+++ b/sec-policy/selinux-nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-nut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.43 2014/08/08 18:50:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-nut/ChangeLog,v 1.44 2014/08/09 19:34:49 swift Exp $
+
+*selinux-nut-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-nut-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-nut-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 41ff9f683e33..df5f0f602c7f 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/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-nut-2.20140311-r1.ebuild 442 SHA256 b9299cfcfc3512665b932b5478ce696cbb90e3c10dcfdf891bf2e20dd3950b63 SHA512 6d84e8960ed2b7ffd4c70a9fe6d02545e9bbd76c9802fa4a819f09282f47163109c6f87f567591765661510310670c0f45baab3cf9a6993c480d0290b9dcd816 WHIRLPOOL 088c0cbc458ac234f33b20b845bd44822ee7e21200ebe48e1e870970b2dab09f607c09bb165f12efaeca524dbcf7bd355342b9d84326ae5e80dc4235e48133a3
 EBUILD selinux-nut-2.20140311-r2.ebuild 442 SHA256 908348823c136a177a8b702d4e53ba60bbb68a4d09ea0a11f3e5f29038692335 SHA512 829e6a1085b2793e1a72640dd0dbe73143466ea4539bacaa1f52e9eb934935b53724e7e3025f5d050e8112819d288a23044e7c9526e120ad28078233a3a313d5 WHIRLPOOL deae1df0bf070f1df0d151592c700a842804ce8418ad5e7a7086d4d1e6d1a60699b13a4a70c93dcfa1df6f19e6c7d5c2684902f7145ac5ba50df5ba70127ef98
 EBUILD selinux-nut-2.20140311-r3.ebuild 442 SHA256 98c1b3d5e30a334e0d686abb0c23121cd5f7e626571971f3e2cfb17131e20ef8 SHA512 79dc565ba91b9a3439951c15b3bd6371c5c17af8f0d6ff47f4578dcb579f6884e2eb44a63a929331f3cdf17f26d761357605fdf17c814a86b1ada3b700b23c24 WHIRLPOOL c1ffc73d76f850f3edff6d383fcb22388a495d2def41e39cdacc36f5c867f398e8075630ea4114b43dd5b0032719a9fa536683f686efa62b60fed6e9a8e14566
 EBUILD selinux-nut-2.20140311-r4.ebuild 444 SHA256 727bfd7ad382c256b0faf31fa6d3383041579f86d3e18a4493247ef7f617bede SHA512 653f2fb76c3b0ae0058960fec86322fc1da77fea7a5eac22f83fdc7581decf09edcf4c4e3f86b41c88ae8ea06d8cbc3c0cd1a779e56c3898ce54639b21c8e421 WHIRLPOOL 1666be544c58d91a410d9834c466fb6ec3be8dfb4bdbe1df542999468aacd53b27d77b94a5c86bc6d0f19186ecb45cc1537b522da92270091265750b32035eaf
+EBUILD selinux-nut-2.20140311-r5.ebuild 420 SHA256 92282c176a60c217653bc98d2f2ecc4f69ae80ebd0e6d78c655ea246aa672182 SHA512 3e93469593ac890d55ea3a7534d0849951c8fb3db74ae9abd6570c3254998897f9fc959cec30c03f1867a5f025d138b35d9c2785fe23351f9d84f79d0151f8cf WHIRLPOOL 2b99804dd18f5495c07088765bed8c183f00a1cdf23b4c1587ce10873365ca6dc7e7617c73bc891cc175464a3e3dd9063a789a8f662f8ddd9f431b14d2db75a9
 EBUILD selinux-nut-9999.ebuild 400 SHA256 9cffa5c1940b786b446bffe823bee70d90cd56bfbe7ca58284999b98a7b46767 SHA512 94928b434557a5cfbe8541a85a8eb72f3181385a347ab5275ecf215d01302674f927a304f6f5ffcd599f77591836e551392838d90bbc85ef61825f24b204456a WHIRLPOOL 2dd029d255a50f7424b1626fcdf9c28e542f6fb356a602c66f8490a70dce49cd0fbdb1b6b77408dcb28f1692bed3160b1d9f3297f084fd571a94cdf2e18c7dec
-MISC ChangeLog 6427 SHA256 e3f6e32cb5069eabe5f0a77b64bfe000d7dac202df0959c28c9e5ec3ed4534d6 SHA512 7ba1ed472e05569cd5a087bc0f738eaddacee51ba8a6e5af154594d11a362ca5a8392fb1ee54f04c910f3b288b732e90367b8067809bb1829888c4f95af1d471 WHIRLPOOL b262a3b565a01ef2d86cfc0d48aa6fb804c1a506b42c50f25c07dc4d345e701b1d4f8bc6c06a84c850502b7cb3eee297164c7a6a352bd30f2565f92c4314b7b2
+MISC ChangeLog 6613 SHA256 23706c7581123f75f665aee0fe0d0753a2b4753a7e80f9b5a1e41a3c4339f557 SHA512 6ecaaf8f64ebe9c14212de01321e8540fd41328c5cab385a0f9d8e24e85548a756a01f03e29d59b400933f2371eb1ae9f07f820fa66ee6561daeda5e8709a56d WHIRLPOOL e332edb476cfb2507d78a007db1ca59738a6322fd3bdf091b46ea73e1ebb9176ad00b3a73dd5cdcb81bd05e3b64ec1e9a7e1c92692d20845e0dbd18bc741a400
 MISC metadata.xml 227 SHA256 1f8a05ede2fedc5c38a8ad8da34f7007ea1c685d91298889a5f48e1282efa568 SHA512 95ed2c8ca6353c8588d7e196d5ac7ea3adc938a062ed9405229efea2645176f658d84a8a3ea7393bdfd26b51d7af48374900e5ac5314afec9fb5fb3ea3bc199e WHIRLPOOL 95e16341b30d2000f0a8255af867de9b5a5f3dcb76c38c371b4b6939bd6a78b50d1e67ddcffb3cb686e88deafa3048b023ae59ef9220883d53768a018f92e03b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyGAAoJEC7dUkA7aK9HrwoP/imMd0dZKzDlWswq4Dv/51qe
-ODuP2Mco9xQYFDv44jeQ1fST8NJniZnbLd3McUiRfMIrIvUOZ7osaiBksuRZ0fMu
-yQpO7n29FMgOTjNGxagiyUEieUk6dUaWWSxbhzOZ4jCuVQAybhZGuSkCia3K2P8h
-Pi3DqMeWfQp5OAJhnYyj2IbqvedryRRGX1SMquoMMRPEbgOoYosSozwabnYYOG/V
-+tsglciIQ31b6ejmLs0CRnGKHDOO5DTnpzUuaF2RTNh2W1gte7OuUJ/9JBl/A997
-7Y5YZq6Fkn34kceAziPpanbHU+E0XgHZHM2+OplC1PKHxZgEfptHvcQCN3Pxv7xY
-yHbOwmAxl+1yYbe1f3AEsq60qcC3LK8ntmgzan3rVSVgAG4EVhHdOzEiiZ8kYEGW
-D/n1Nyk+BpOw2UZGzfCwNesFmv2+qG5SegK2ZzC8s9KEpqNw0vVPiKNfYBTYnfj8
-yQzmHL1o/a9n9bmrGQ155ymp2mXLXZjt4oqHHkqPZZSjEDb9NeF3Z/1jG8G9XxKj
-xLH9xb63qVKXXefLZ24s622RKbX6QKwizr0oeMYvZW/G79qar8ojZ+ZSZeoS3Mog
-kiAusHOhOX3Rh+pmwzBnum2BLktmC7vO/WHedkae9V7RlYdIfyGmvocOj3EZJrbt
-k8iAkLtcgfgWad5SrKmm
-=D1cm
+iQIcBAEBCAAGBQJT5nhaAAoJEC7dUkA7aK9H9hIP/3QuPniCmXqIuqZXHEXRkp6Q
+3JwQyazLnDcHbkdfNRHxDY3HTfGYeaYKW4YrsK5tkm0GrcgqvTJ2NvtBXhvFtSN1
+DJzUSjpowPMQrSF6XCujdgga7N9Lr746azDSs5VURMdmqYtO76K4KjIdUNV5iOxM
+coZPccgHJ5lG+UkUnotM6I/b0PLPduWND4Th9ZdJdZRsdfEwnh44ECXmsd4zDAZ/
+PNANru6P5/4RLK6w08MEdc4YuSiH/vdPdh7ojiNaUOuhi3ReTvj28/lIaxTFMnO5
+k1R10QXHX4f8DQwd6Qc2L45c/xHEGzt4r9MbsD3mpF7p76WtcMfe+ox1kFhJZ3oe
+S7gCHJR47EmWvitbqoO+fm52knsstwmsQZOiodZnWs6O80eaPhniIhweYXCpNdCY
+w5vHbdZf5zwfombgnk4YZ0jOSpZZmIHXweXg00Tkz5owjK2QiGN4oON5Bt85hOxU
+KQEsHnSI/43KsFh8YOgeW8NgBhSADG3XQ9VE2iz37iQtgkp0Uo0SyOpriyVGyDC6
+b6ci4/qlTdy7emBcm/O1Ifmzo3a0z/2wZZYXlu2jIIfVUwYegsBP4qSYgmm/gdii
+OoHguKtp0mJNShWUvExk511t32NeZ5oJJo+R6qMKqymBYQw6x4dvoZ3DilfHA1nm
+DLQRf3AOGAZERnAuNAjN
+=FQeD
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20140311-r5.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..4ba85c7f1706
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-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-nut/selinux-nut-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:49 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"