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-automount/ChangeLog b/sec-policy/selinux-automount/ChangeLog
index 9bcc57f945bc..ca50efbcc113 100644
--- a/sec-policy/selinux-automount/ChangeLog
+++ b/sec-policy/selinux-automount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-automount
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.42 2014/08/08 18:49:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-automount/ChangeLog,v 1.43 2014/08/09 19:34:23 swift Exp $
+
+*selinux-automount-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-automount-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-automount-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 92d0e1482a69..942f83add079 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/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-automount-2.20140311-r1.ebuild 399 SHA256 5c3bf3140cbea5423a670c673b9628ef1b52e7319da3f2490f63221adb380b26 SHA512 93c93141be2727b56cbf5e548d3ab3a1eadbfc7aab3ab3c8941d60c3d101c4878b0e4cdd1078f602fe98614426b10d935bdd68a8eadcd560aad3d6bb60fa7fd0 WHIRLPOOL 3950a718ef71d0a52ca7e1c6335a43004005eb08905a39985babd5fe4bf0875ca637650ddb4a54aabdf9751b57e25f12ed3f83032b8dc170150f744d0133ac78
 EBUILD selinux-automount-2.20140311-r2.ebuild 399 SHA256 e073413cedf48838563d5b7463075581e2e42467dcd728eaffc94a571e5f91e4 SHA512 7f2e534e801978dffa73016eb9273ba7dc58b3b8803041220965d738b061a71ebb34fdc757f22aaec215fde277d620d476945c82f6d5fe09c7eb851a9eccf740 WHIRLPOOL 14a1ce729ec1fbfd9e77d264d24eb0dedab2a7af11223c2cb259a57bbada1ebd98128c1f278cd7b4eefbc9126fb879e4acc0476f4b05ca83e37f735c86aa0bee
 EBUILD selinux-automount-2.20140311-r3.ebuild 399 SHA256 912771f01bdaa7faefd304cb197e77b08f302a9e0590ec84566879b9aa18eb9b SHA512 5ff5937cd4deb8be5e4226db9818b2cf7155b996dde7bdde2d1ba22b86d79d2dc696cbd4210d954b649397677c5003172e095ce1458dc5ce7861963312e94430 WHIRLPOOL 953578b987c864d30ff396588dd58a3b040086e2d8a14618b338898c1db3e9b156a6f10a911ec1a9d71ec7172e3579a69d4976f168847cf225699936963d21ba
 EBUILD selinux-automount-2.20140311-r4.ebuild 401 SHA256 8f5281aa25046b08726c8ccd0701ec853e358ae4382a7053d7b166824fca3d66 SHA512 a76cddc8a6b00f3a9f31cee14336436bb912390d8a200d2bb4155d104516a766354a29627008f45922f0048be0fa9e40e70c6e5a4a42a37260938e5a2fad47c6 WHIRLPOOL a50752d23a24db3e4c805c0dc774af3ee40a6b791c637d9ffdfd1273bb259253bfe7b868ed49bdebea9c7f4c06d26b30649fb6fa3807a64c88fc27d3dcb50b83
+EBUILD selinux-automount-2.20140311-r5.ebuild 377 SHA256 f23dbaa458a09abc88763d66f70017cf09eecc49a14b546940d4f1ea69342cf6 SHA512 44e726807b4b32eb340e63a38cb84bd90bdf155b51f51e5878afe0f9743f626fd49edc52e5f674966151cceb18354c252aba7b1cb05b75e7094ef11bad2b8239 WHIRLPOOL a08b9e1483dd7f7e1b3b82d1cbe3e5e16b3a28b3c665963501e8734a2517aa77e16d5106782717528f8c4e7d9c5e217741acfe2d3723299f84d3f3307197708d
 EBUILD selinux-automount-9999.ebuild 357 SHA256 96ec936afc1864b2da105d9330aa9a94a040e825fd712d450a8514ebeb0cd09f SHA512 4247a6be550ebebda0481e3eced22181f348f374a9fabd387c81f0f5f0f799952d27aa1aa77fec524ba35ad7ba81b1269c9b94f1789b0721d196f2fce3305a59 WHIRLPOOL 12179fe2990b3a933f8b25a72959f8b64e6f48666cce004e3f0c0e498e9c51204ac08e87d4ae42c4ffe4e0f42cd2ca041d157b52fdf56f5789e9989f75210ac9
-MISC ChangeLog 6746 SHA256 1dac96c103e9353d6621a16d76aed4b6db6a19e9b490d3f7fc0fb3b399e2b467 SHA512 872fa7c399b297c67ce51ae22c7faab1a0d9c0501ac2897b8c32e38d8834128ac425fad6d3f37bbb93058a957fbbe40dec09e98d1e7fa61b828c402be6610abd WHIRLPOOL 31c5e489453fe8d8fb76b6c69ed2bf4394aa51f20536b52ef272e7e9eb5ec10b4c36e60a4c55c31f574cc7b145d58cc34f3b7e28eff50ac4551c9c13d1fcc11f
+MISC ChangeLog 6944 SHA256 64fe2efe07099a5295161be024140b2b963db268333bcb305f31daffebe373df SHA512 b798252853b8005e943acaf2819b4c3920d4d0f0f3a670f479e94bb5321013a8e8f4885f10a82b6de7aa9d257701704f8ae57af802b12768de3aa364765e8c44 WHIRLPOOL 447c277ff3733c62307700031befba3f0b29bdc53903b29ebd4807fe8701e36e132852910707c4e6cdcfaa8c04243d29284159ec65bad8e214e449f62cf0f9e8
 MISC metadata.xml 233 SHA256 8b5d855aa7def2563e46b9dd5d15837c04eaa2ea6e82ede0821a8841cd9edf58 SHA512 656c4a72c5f4590d0f3bc374c336d959e7ef014cc5ed16f44a6d4109572568c03bdf1552e96861425258c05178564c10e66eb85ab87d3c3a76ce4538ec178119 WHIRLPOOL 3c8a86e83de15ada25d19632d652e169c179da50595666bfb72d36980ad3323924f07fb1158e1a6977b4ea0ec22b98c33667732e15953ece2705676d8ca3bd66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RxaAAoJEC7dUkA7aK9HFJ8P/AnVwR20R3d+Z0d76iB8bICU
-StgmiEzQmE4HaKd3HBf9DucM83z+Ij4eiGyYRz9N3BHRn4L6PGGLnL7cbygZ1oNK
-uhEVnTIOuVXvyaLBfCgQHUTxjragopQe5hpuFpuka99f5b/sJYaEgrXTGMr7DNdG
-OlQu3zISzQWKbIUTy5Z9QXsXubH5ydZTWEpLFCKpQuDEdpv1PxrlmTXfht91wtjR
-6uKTDspZa6gAXS6Odc8PLJjRWOIfZKxQwQfGABIyEmQfrFicnNtSTo+FjNVJZmEb
-XihvtyAsMwO/aWqKwvBNPKYp0kwTPU/gezzGnFH7jbte5MR085D1Y8bjg2xh8lQu
-2z6q0aAdqvSg8dRHnQYDJCrtztsysqvCGglJBF6c+ZB4ggCDEvv1PeXRNS8iGiM8
-nTwHQRRKSA7Qhix9OLdaL9nWKkm/4hSNclvFwicpYqrXqnTYdXqTNppu3F6h9xGM
-L15hGI0PskdLrEEvfRqXvBA2Lbo9oj9m6saWjKuPGl6KOLAf9w+XBxM6aqlb95uP
-4R5V9Sn3J6/tMsM91D9zqQnmWO7mmOltsmvBmh4IYhBPGwB/6/aIlG9g6su1Du2e
-wgmVaH7YsylHjQ11Emjs+h+AwmCoPInLf5MK1/8k2ktJbG37S8J1MQr6v+nofJ/n
-Qabch/dUbqgS5kyheTpT
-=D8MJ
+iQIcBAEBCAAGBQJT5ngsAAoJEC7dUkA7aK9HauQP/jZTqbQ12CzoX5b9SoWuni5n
+EH2aSLxxYh1NLszvNDzQnPeyJNq5oZMniA3Ca4HKVAUCElV5VGt9+8Pw/hUcN5c0
+l4sC7gqhv1/ujlNKOKYB9X/PjjwPL7Ai48oGUWc+sVw6pgl69skS/sDAlUr+1k9L
+Xr9Ai8K97SAh8d8qCCjtfYacMp0Se9uVSaCi/i591cBH4xTGqfInaP1wLIsQDAyu
+fq75gEWhajgl4RNhUCCxwGhLjV8TKvbzc3JIM2zftiYVoFERXWvy3OTI+stmrULa
+DT9iAXsGBT0ri0rXEp3MAVEhbt2C5BofG0AyLIe7DsY9SlPj0V6QQwWhImRFkMKB
+2XWjNOGapwHtK46sxqy2vQjAxqo895K+PadmIR99t+ZL3j0P7VgQZvAXBZts3LBc
+kqjl++gR3labFTgzVwbkF5RlH+A84TyycPnoYns5DcM+FeTA4R5clDWxqPd2EU7X
+XEZcXF4FX7lkHoAvybKutlbvJqpjY6Pi4YJkIKLZpH896qlVYOM7EX11qlF3xLy4
+8Hm6I61ys1PR9/PXtxA+HbZ8X6EChJq/88iM/8id3yfHGuKkqP2njJMLEiNTWJ8+
+d236g/r5/SGEXWSnxq8MY+K5T1tg7Y0RIm1y/zS6XpLV1NvVU/pThf+mZWM5sktY
+usK7twxcQEq1Lzd7vz25
+=ubwt
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20140311-r5.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..ccf3f5733fbb
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-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-automount/selinux-automount-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:23 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+KEYWORDS="~amd64 ~x86"