gentoo resync : 17.02.2020

3 files changed, 27 insertions, 3 deletions

diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index a89f939f6756..30c27cfd1db8 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/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-squid-2.20180114-r1.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
 EBUILD selinux-squid-2.20180114-r2.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
 EBUILD selinux-squid-2.20180114-r3.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 EBUILD selinux-squid-2.20180701-r1.ebuild 376 BLAKE2B ad42454befe5ca67e0c57ba676728cd5980162aeb779b9ca4f8539cdc00480886321084bb1448113210c9bddae8bad011f5241914aea8245f7328d6c9ca0083e SHA512 27a186e36208c45f23ce6de9b747ffd78d00ba1494414519c1a2cccb284d5cce9b0170b9cbbac209ff28486e7e5d315fe75c6c73086a52fdb723428dfb1403a5
 EBUILD selinux-squid-2.20180701-r2.ebuild 375 BLAKE2B eed7c44a437e96a61b7bab27f82172a4f2607579901600b7ddc628006cf9b07dd7215f61be117a1ec421afb4da8e8ce4e80a3ad62ae9482d13eac114690ea9e3 SHA512 a366202a9881beb31ebdb72a36633e804445311a577645f52656c82d1cff753e4d061b18979f732128b6eff8cc808c94275a5dc615b1fe552f0826bdb8ceeba3
-EBUILD selinux-squid-2.20190201-r1.ebuild 375 BLAKE2B 84221456064e43324e150c7c19d44c46a954756450385b44c0a153dd77a976f0c8cf86285ad3ace9c3baa50284283a29c7012f0e9a62e52e602b8eb04f13a62f SHA512 0154b4fb62f07ddf48e56710829941c3432194551dcb648c3af796898c9f1ee8ff0db181e815b7ac2a7f5ec17d63e1dbab10b711396b8d9f9508807a9e025c3a
+EBUILD selinux-squid-2.20190201-r1.ebuild 373 BLAKE2B 885e8be9dafaa146bafd587381bdaae448b8eeebea3d2ac01706ed62fd5415874ad39e6843889397e210b9fe67fa7e55409ba177c5904cb991f629dcd6b8ad5b SHA512 825fce44d425433ac28994bc6bdecec3bbefd31534108621253decdd5bbd963b4f6bee345d2ff8c3f900a07766b46334ba1771749adf3545fb23663af6629eb8
+EBUILD selinux-squid-2.20190609-r1.ebuild 375 BLAKE2B 537febddd608108ba4af2c65d9ef50ffcb714532e105f11b77f1cb8d5abbda97d477c1af85b70edfb3757f89feea0a309f914eaa45fc951a6de45d10b1ca4f51 SHA512 5621d99c90b2ac184b5ea860edfe7e2e7d8e56765619511b7e9e3166ff9d556d7f04e9fb3bf5737618863931fd68c853d4ebf126b38685e1948bfc61a6b17662
 EBUILD selinux-squid-9999.ebuild 378 BLAKE2B b7e5cc385a14d431e42c34f7f37c73ced8cd32ecf8715635812a3b43d864d3f913bd32fd350c51a48c7f0151efff88ec085e27fd9caec3826ec9e6a719b79d3d SHA512 8e5db7995e80e9ed63418ee90124ac63194b3a667b661576479887b604d184c44cc4b6ca85213192ad561a2de61b3851f718043f7d77eeb2d633228376fec4d9
 MISC metadata.xml 315 BLAKE2B 73d453753c413703df9d5b137710f031f520258d26efcdf9076ae128573efae6fc54210fb815a446015c1046c454b485476bfe912c8fbdec163965ecb22f6796 SHA512 0742eacb66c8dcaa556ca6bdc0d55789c28d5f776b065340d6f72eea41ddbd1ac34fa4d5257a11cd970e23c42b4ed36b556838d619b70b8fa78d854bfc82396d
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20190201-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20190201-r1.ebuild
index 3e8c3f2ff006..8dc370ba476e 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-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 squid"
 
 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-squid/selinux-squid-2.20190609-r1.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..47d263f7fc0d
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-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="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"