gentoo resync : 17.02.2020

3 files changed, 27 insertions, 3 deletions

diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index de05852f50dc..06aa38e6cc4c 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -4,14 +4,17 @@ DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5
 DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
 DIST patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2 320881 BLAKE2B 12382c64ff8d2acef97ae50b0285061b7f018df0d94034670696b6f19003ee9c9c4f66c711e744696e47145857fcbd577a7762fa807921b40a5366e473901687 SHA512 29453f9deb90b7f982d5a6a3161d79a8171d58d20c0e0de523347d4f1296ad3d4ed970ada0823692e8def4f21756d727628bd919802ec2b1c39087ce5d0811b0
 DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
+DIST patchbundle-selinux-base-policy-2.20190609-r1.tar.bz2 407664 BLAKE2B e6b6b56f990389365c062522582e2177bc3b70040c99948efad25737e69178f9f72149cc443cb9edacfdd1aa6bc29f637cc61939f66e5cc3841f83298b33c41e SHA512 16195b51bb414ac82821f93756b3b5d0ec206b7035a50379c1f796082d9c53b11369e15086e1e26521808944266364470c43dcfdd1818ba079fda1613b7ef9bd
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
 DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
 DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
+DIST refpolicy-2.20190609.tar.bz2 555882 BLAKE2B abc45d9c906e0c880b7c47b0fb8e33f4a277c73244e20e8a95c44452db817241110127a5f8a3347cfbf5e30bf91f9dd4e5dd826426eb88b383fdbff5963f5fcd SHA512 f05ca08d31e62b7bf7203d7b243cce9ba87dd68d13b30067b99a44d5007449078fa82d591faa88c2955d370a346e69faedc850c02bd77c5624a8c746a13467f3
 EBUILD selinux-phpfpm-2.20180114-r1.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
 EBUILD selinux-phpfpm-2.20180114-r2.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
 EBUILD selinux-phpfpm-2.20180114-r3.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 EBUILD selinux-phpfpm-2.20180701-r1.ebuild 378 BLAKE2B 1ee2960b59f4859f12d451e004649a0b32b95408e57bb2811896dae8529c7a551ce79ff427eaa0bedc134608ef88280c22e729509362d78e9cf814bb8c1ea738 SHA512 0b6cded271592617ad5d8f552f8a55be91af3adf80cf7713b305d7c2c43eacbb3af40f601d41000f718e1b40767665ba95d893a24ed8a4befd2537e6b102e40e
 EBUILD selinux-phpfpm-2.20180701-r2.ebuild 377 BLAKE2B 2ad3cce2500635ce48ad64b1393935964f265d5b0531ef439e7a9d80741bd12582033830acb38dd5da78e2de41a1c5f7fe82dc09d146449a9689692779ca5a92 SHA512 454e89eaf7538fd18dd03c953d2b167685efcfa54ad9c73c0c73aab433b651da398a3c534e02eb4f28e112c9d32dd574e84dcba76d98e9b90135d09d93607727
-EBUILD selinux-phpfpm-2.20190201-r1.ebuild 377 BLAKE2B e3367796011b74f4aff743471cfc3e7f4a87870adc461fd696c2b57fae5665c27d19b1c96b694fcae89a21a384d80e6463f5ce3c447b00cca9c80ba47da0f561 SHA512 25d91c07242bbefd7615c2665b0ff764465ca48089f30425d60c906461d393f49b51f9209c44c35df20592eee49b76f7312d1fd861336522a57307a006162cba
+EBUILD selinux-phpfpm-2.20190201-r1.ebuild 375 BLAKE2B 089da64a70fbac8ac9d501782b1461bf0d96315719fdd6ad2c2907c07ac2d0cef52923e5844cdfca64caee95b7606bbe6e303c8d479ae1ddfdb3fbe40b3dfc7d SHA512 6d5ce0f583744237ffd5046672ff00fe0faed7775b4f457d1d1587a7d372141e4232b0b7176474365d5fc6d9d707cd779c66af3c4de548b884088b46d6440817
+EBUILD selinux-phpfpm-2.20190609-r1.ebuild 377 BLAKE2B 0b1174701d156d7dde63a3773990c2098cc0e3e790721e85711ec9fbb88b46951cd01922b74bcea83035d502c4b456e4960d0fd2884e7a0c5289f39de29fc809 SHA512 05c54e083b8d2d161baee23b74bdb13486c64937d5f9c6a6f652d201a299ea963a31408fd3c7e399df5f529586ea95d155a4ec5828adfa757a6817f285ba9b55
 EBUILD selinux-phpfpm-9999.ebuild 380 BLAKE2B 3694c381aecfd427fbc3dc9069a729cdd0e923a6dc8b36e5204082acbf91f537274e52e40d27c1c60de3d1af42e904922dd45a8a5f4735cf2009f0fa3030314c SHA512 33a73b97d169cf0e27a135cf924041ba933e3aad3c65fb3fe028a814f7197c9eed3b01deffb2532a9783769cc66a69d877456a04028467227adaec315bd614fe
 MISC metadata.xml 316 BLAKE2B 491ffb7eba4985bada61e934b968c15e8eaa6bb358065a9eaa02e9d637c9f6fa5db6cbac130b5c00cc16ebd9d867082c7d734923f932132a9e6ac6c015f452df SHA512 9e18c465be0429fc172b0f8636488175749a69d8066deca7c00bd7d456b12ba9beb1c115fc1468add61c4d34863aa617d1710372a4c75f0f3ba66e3e9265e242
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild
index 3f6d809678b9..495a799ebde2 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for phpfpm"
 
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 -arm ~arm64 ~mips x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..3a745cef6455
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20190609-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"