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-phpfpm/ChangeLog b/sec-policy/selinux-phpfpm/ChangeLog
index 89d720059257..1caab4a58aa4 100644
--- a/sec-policy/selinux-phpfpm/ChangeLog
+++ b/sec-policy/selinux-phpfpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sec-policy/selinux-phpfpm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.33 2014/08/08 18:49:33 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-phpfpm/ChangeLog,v 1.34 2014/08/09 19:34:43 swift Exp $
+
+*selinux-phpfpm-2.20140311-r5 (09 Aug 2014)
+
+  09 Aug 2014; Sven Vermeulen <swift@gentoo.org>
+  +selinux-phpfpm-2.20140311-r5.ebuild:
+  Bump towards r5 (fixes duplicate context for hiawatha)
 
   08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-phpfpm-9999.ebuild:
   Make 9999 ebuilds EAPI=5 and transform to make master for version bumps
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 784050b11ec0..86c4f2c81099 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/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-phpfpm-2.20140311-r1.ebuild 454 SHA256 26b44bb3f05d5e80304923f943decae4725cc14180aa0099f8b9893abd9df8b3 SHA512 cd7bacb4dc0c8215f6f4903a989a56554155a898d8b83948da8cecbed5ec0ab9e91bdacbb8472a250696d2df49d78ea3344242bb6c44635873480a60c3f977d8 WHIRLPOOL a66f1b9d1fdf398c3a21ac3600b3c6acc253fffbc3d593cc07033e18cee25e5f510ea6bf0c58416b98e1e40818c83f9cb320cd827260acff0ad6bc1796c33dc7
 EBUILD selinux-phpfpm-2.20140311-r2.ebuild 454 SHA256 0d48bce95c9007208297630d5fab91251a6e3e1f4aba4570590237326a89a2b8 SHA512 90306ccfe9075150a997dcaacc23eedd0481ec76153f43f2ea827fc0d64603ea11f2af8b25a2bbbfa82142e179c4b8db5972c9b3132ae844328774d45c5112e8 WHIRLPOOL b5585cba3a76034fc3be827b3bc8acc013ed3e5b1b8dab58187da0d417a05e556223fcbefce38f2ea6831e95733d6ca82b376288265301998e2723bf5c20603e
 EBUILD selinux-phpfpm-2.20140311-r3.ebuild 454 SHA256 25f2f7ef09f384531dab9ed7073c46cac4b3221c2e38d48f156ac782e1c656a4 SHA512 61a9c49d9c7412173fea9ba4eea320716635a31146f2e4a9567471c3248787d168d8a670c4987d6d419977f05fe43a41115a83c7be8adda85c1df433c3250e3e WHIRLPOOL 056e04867c71e80c58ec7354186d9cf44719d137b766637c78f245ab0e0e2c5c6b5e6a7863f692535530d8c5d19992dac7074fd167365f269f4537f945b9a541
 EBUILD selinux-phpfpm-2.20140311-r4.ebuild 456 SHA256 1e94ad89fbb63dc06c28311718a9647c7da155e45208fe4da9072c92d07052a8 SHA512 d20e1dc63ddb74659b9bb9442524d47bc86f71d6dd8476a5efc5a43ab1afda4b9d38447385045a75048cb474a6fe0cf39065265bd33e6ed3f4d8abcf75c4ca90 WHIRLPOOL e6df00b1e29cbe392fef7d2b5802534b396792407e6337fd91332785e18018cf66738b086c21b2c704fab51c7bea688c46bb9eec12e575e7dea6159120b2fef6
+EBUILD selinux-phpfpm-2.20140311-r5.ebuild 432 SHA256 52b3c1d6292435a9272393d8d560bbaf2ad4645c0dee54a8f4d2bda762f12303 SHA512 9e81a9069ca8e5e95fd6bca6e494cae8cdc6ae9f6e0fb63a4ce5b25a57d4935540dcef404c149abd07867d84c37ea19bfdbb55c6685fc212a418840445a7c194 WHIRLPOOL d06b97c8bce151ada2952152c3672d6fe4a07a4c6649959605be31a84a5e9e000e11a3436b9b7ca31f9bd1e5e3b5b7a1cf74f11c4e603a6df371e085dfd72483
 EBUILD selinux-phpfpm-9999.ebuild 412 SHA256 7b4f1d3b46274e3f88c6a0cd2e68a77a6990f36c6e3fd4b02edf7584acaf1ca9 SHA512 14b2241450a75963c96f94d9ab59fccee65fb2e06b056b0a2025dfae4b5844ab842b9749214b3df835c964f944828aaecb23db0bf5198bdc3fe8377bf09d8b0e WHIRLPOOL 437af6fd6cfde2f174c2220ffd9753504bb192e487e6a9949c53be0da2c796525fedb2dee8baf9f1c5305055cef9ef4dafa6762c7991774a35c30c9a47ac8d04
-MISC ChangeLog 5485 SHA256 7ab89715d2328ecbf2316756c51baea0c1cb944caf07aeb0e6986ba23ae54146 SHA512 32d1984a4bfbb557bd392844210b6e1f47e9149eab718e40fac52a0444e3d804a6053596f9c56bb806fd6a4f801c19fe8599c5cb4bd08c21abfefe823ed179e7 WHIRLPOOL 4060059b5bc51729338485ab970ff370ecbe3b33581c38e36feddf9941e090b36d96e162db29d5d0978975a4bfe3e3204467f3b40bb74f26196284a70542f14a
+MISC ChangeLog 5677 SHA256 65329fa52c04f62cf4ddaff80a816717548ee184ce41ead0061812eb5baf578d SHA512 4bdc034121b9af69207594216b50865b90baae4ecc837b1e0024cc509d9d7f430fcca502f020ec8ac3c3653e614db20e56b076a243cce55d558feb2ba4d71384 WHIRLPOOL 747ff78e621dbf6f752fba2b6bd7cb761230f5a1f7495bb7d344f86f34289361cec5dbd5bd9a869937e490afb2f21843d67bd1f47e28671f35b6c85f396dfdf3
 MISC metadata.xml 230 SHA256 c5763daa5fde303eb913cadcbd6981e93fda02f3143972cb041b7503ae2e8588 SHA512 4092bf23225d185bd87010bde59b5710072b71f6c1762457397a66af4f1f8a4c22c0bdcab3b5ca09dc1f257249931dba918625efc2ae7a026d21ad9df03c2df0 WHIRLPOOL c5be363d8bcee9a9361ab300b8a54cd3c0c4557342ec00408181e4d36fa3ce07b3f9041da7da719698efbeb896955c5ed149ae79e22acae23e9c3a4fa3539a53
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT5RyKAAoJEC7dUkA7aK9HxxYQAI6qo/3YpgyQtSuYiOoMvKyg
-AzqL8/g6dFXdCesHx1I78Jvb9HoqlIxxDdg4JkrclezthEU/mDQSGez4eU/qCgS3
-ltJMYvM1Oa/Ap3IxZ9fYeVoDOrBT3ZZ04vLheI7VmxDlZTqnI6lmJaTdm/io00EJ
-sC99eWoe2XVgTBlKL5WmRGIDEo8KrKLpDnchq8UeVpAnm7yA9cvs6hYzXyS/lahZ
-tXsNjJCmuIxTInAgoli7cEU54ToFU8gW5VwTrIt0Swa0OsYSrQzxHE1xiIcjHPMC
-KpeWj7svaHiSh/RKOhV5c9eyT3V3MhZgIa0NrEH9kImeDUUMf0Y3LvIgyBSWLaCB
-p4b16iduwyqMjamhFpAoFVzbadB6WfkcZhqSiaxig57fM3IN0EtfQxexLbNq51Iu
-gf5M+j1PLu5XXblCRf9YpD+jPPRgHD9jnkNBODQT8u61Gp2R7WnCzHcBGDjxV76H
-p1IbMBbToCP/XcZzP+AHL0Bxtjiw+Zxm2Ft+K/wYOZCZHdkrxfJnvXlJUNUT7ya8
-9NNNF7L4b/XgloUh09qVQAJjX56r8z1w7psdlsWAWYfF/NFVJeJSSZCGLquYJLFq
-RzqBzHwDrvsvI01yRw1pFNJlJLTJJXN4oLoXYfaY6ZgyRQsIEPQ2Uz5J1lPeFcgO
-qhF2rbMqN5SucKlTskwn
-=ZMBM
+iQIcBAEBCAAGBQJT5nhfAAoJEC7dUkA7aK9HbqUP+gORI/kjyR7+CL524+p/C/W3
+ANPOoB+m1eA+cXVdBrOdWK1IBGQ7Y/Zf2CyJh6uSGSHaJ77pPX7fmkNZYhMapmB9
+O7sxnKjQttNz0U7weR9mcjAm6Kl8k6okY3g4je2m9t/Uwg7e8QWKUNeXHdLPTYO6
+Xbz5DfLzvIXkAHOZV4CD5IheidkYD6Z3jle5FbyEip55yuVlVK7ZNLXoWSHpeCoi
+iB321OHcGp6l6PdDefqK7xXeSwaUXsd488LgJYyslMSfgmOqd8xN/4KB9eB4jzHn
+bww6NZm/GZd9PEU89yBWTLqBQnOSBC/dyWFQWhSX/W93pSAAUDmOpBBBXGf83VIS
+g1Na8FsMzMZBqjBwJRy4GE78vZvZ4tyYxYvYyn/jhLl21mqmR30Q1NW7JR75wHDt
+H9561GzgQ/aD/jjtdCeYFT0x8gCkTNeUaBu86zQOqMtM/nSIP4jZV/1stfD3Mz4c
+2Rwe00Om4PFskuYdEEyCp6YP3jZ6YMOe7DpACJvfONr37ey/+8xsCOyXtwS673PT
+yHPa9ocb8qn9l0nYvXkLqoLNnk89p3tqpq2KrEnXHMflElX8nM3VkR9TQ5JXFUuy
+88cCQQOWwRwHCo0UbZAhhinHU0+CpF0372bZohB4TOru5Q4bIT1DnqCXB7XJ1JJb
+Q5RBUhPQwjk9zpODboLg
+=UIkI
 -----END PGP SIGNATURE-----
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild
new file mode 100644
index 000000000000..a2138c1dc16c
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-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-phpfpm/selinux-phpfpm-2.20140311-r5.ebuild,v 1.1 2014/08/09 19:34:43 swift Exp $
+EAPI="5"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+KEYWORDS="~amd64 ~x86"
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}"