gentoo resync : 17.02.2020

3 files changed, 27 insertions, 3 deletions

diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 1dcbf590ff20..a7f62f399356 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/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-nginx-2.20180114-r1.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
 EBUILD selinux-nginx-2.20180114-r2.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
 EBUILD selinux-nginx-2.20180114-r3.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 EBUILD selinux-nginx-2.20180701-r1.ebuild 375 BLAKE2B a40891117ba673f44c6e7704108005dc1cdb8a51dde5af12659956c4fc294c66bf0558415b656ef4390a4fbd04b96cbe1dd003c16b9ccd15d87c2a8862dd0bed SHA512 896d5281b76ec286757fd8435f01022694b4055d4a5083475987c3d1a4f1c4294a43bb547157936e2a27e0cbf54559b01557f864363b72cdb0f3b4ac1f0dfcda
 EBUILD selinux-nginx-2.20180701-r2.ebuild 374 BLAKE2B 1084bdd87adb3c114dc07d60f72e7d1c177c070f95b65347c27691a85dffe3f6a7bce3398f542c33b66836c476b4744d1f823b1fa5a293a7e6d31f84b08a49c2 SHA512 93e89117007662f8b839934b050976e59535b0eaeaf4f91585eeca065122782f14e792030edba7ba5dedd18b5e832004973d1ee0b159c0445a6f84a26d9fc074
-EBUILD selinux-nginx-2.20190201-r1.ebuild 374 BLAKE2B d3599e0c529353a0c3abf5bec307af315076edca6fc1c10dd75b267db9ce96a22aa353e35dd2135f34daccc3fa26edc4dc5a557d5e07fb586ec3698a881d592d SHA512 592b736e85019f63293ced78b8be51136f4c34fe272477bcc109458d9100098264259a03c0dcf0b454c0a17481c73c72925deedff517964b9a6345ae82adb068
+EBUILD selinux-nginx-2.20190201-r1.ebuild 372 BLAKE2B 80e25ee56b95a2d97f89ead571a83287e7597bded5e1b67ae89083e4355fbbde085150f1ea77e158ef67b7511804205412db4ace86d9580aa6e522bf90a617b8 SHA512 69dcf6b1807c39173c14c232222f03b6b83de03566a652cfb80faa29c44ddffa1e2db8df5fcefba97670a635f93ebab1226bfd863fa87379c5a9a89f62f97636
+EBUILD selinux-nginx-2.20190609-r1.ebuild 374 BLAKE2B ccffae3a3257fbabc8eecc582a0552d7cb872fd68f15a9937e3d6fba0b25c80db70f2ed9002cb6fc2dfba16199385fe62011e9f049818d3f105745e6f94d6126 SHA512 fab838e453a653bcaf5f82cc91c452830c9c817dc44ac8f5f6efbc3d9fdce729a0e315f7a653b10507d9a3eeb51b262446bf584f4217933d3683059a66e48235
 EBUILD selinux-nginx-9999.ebuild 377 BLAKE2B eda273645dca0d1db66f755b44ac36ff55427ec225ac242ce305e85bcfde41df960a3a00ecb16327519b61b82ec203dca056eef0c2c180c7182e2464df8f11c9 SHA512 eadb4bb94e96f8cb80a1a41bdba50dae50c990391d37fecc08a1fe50236d6b747a7087e8aa2a7cb4ecfb067f43554e65d98b3d589c326b3db72ac9e863d55baa
 MISC metadata.xml 315 BLAKE2B 19c860410de694561fa09b50d87c5ea3290bb66c7b9b587c3a28e245d858519d10ac0e303b1038e1f9a3b9f9401425876d59f286289ffa657d06449f7cd7054a SHA512 3728836b5b16fc9d04bb74db4e7f0f9ab5418e3831c54ff56af4c65b7d3cfda5c1e710b5ed79766e08e0a978b744b0fe658644fb66e88776886a44296ea70f02
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20190201-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20190201-r1.ebuild
index 16fd82e7ad29..2d6fbf714ba6 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-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 nginx"
 
 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-nginx/selinux-nginx-2.20190609-r1.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..68ebca1fd39f
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-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="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"