gentoo resync : 17.02.2020

3 files changed, 27 insertions, 3 deletions

diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 4d61a1d9ed85..34c509183578 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/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-munin-2.20180114-r1.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
 EBUILD selinux-munin-2.20180114-r2.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
 EBUILD selinux-munin-2.20180114-r3.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 EBUILD selinux-munin-2.20180701-r1.ebuild 376 BLAKE2B b481f500c3fb6034eaa30bb6a4a7f01f7de91df6fc6f90336d5cdaca4a3feb8960545d400267b1527369e9b30080d719483ae06ffeb8a85e54b9a554d20457f1 SHA512 429375708c60175af3f6c36213868a4ada2c79bc27e220aa664b9347219edf70d36ae6a86489b1e766c2aec5393418ad60160b8fa678fa187d1257c7a4a5c688
 EBUILD selinux-munin-2.20180701-r2.ebuild 375 BLAKE2B cde523805ab7e761c380430d89b7c77942cc8a85d30eb317427ec6e056232ccfb97e276d816a0f0c0e0ea1627be242697efc5a152e37520428a9aa74b1ca99c5 SHA512 5df3e0133880d1880cfb8c0fe8220379765891107c04aa88a8dfe0be3bdce84949908ca2df8820d3411caa7fcfc103e8281997098b1f812df5dabd86a178d485
-EBUILD selinux-munin-2.20190201-r1.ebuild 375 BLAKE2B 74c69eeec3f541c55165451535855058d0bc11162402e263546196fbaa09ac56f985464b55449f161aac6ca5fc1e6414933a3e1c68824044cfd27b8636e2be1e SHA512 940523533e2d94857c894f851be7b6c4c2ecc1695a4a05a7642caa399a57f0873a3744745362ec773c1b50e113bb47deb6d4243cf8668e5d4a5b8c353152c38e
+EBUILD selinux-munin-2.20190201-r1.ebuild 373 BLAKE2B 18894fa79e099fbab5f7a992a27cad6fa0c426fc21cc5a0c32c00c2bdc1ed5ed052ab3c33b11f854ea5884c90c4654e1e1dde37fa741783db387cadf41061f85 SHA512 4e6e5221456bad0cc842f21e404d4ab569b3a5d4574fff1e3d230eea556e6655d54b5520446695fbe71f508ab35f805bb183ffe96757cd0c199aa549cad5ea1f
+EBUILD selinux-munin-2.20190609-r1.ebuild 375 BLAKE2B 0d06726d0b39ad69f7b8145b5215dd790cdb3becfc810a5f5bf62a368e06db2c4e14642d87e650f6ed1b1ac1b853bf843572068838d94caa4fd965b986246c08 SHA512 a2009d2ac4162ee773ab08a577908952542b83714f744229c3edc747b82999d6fb33ed2ceb22c6ff1f64c5904d3931581fd05d2262b7570e5b713e14607d1b17
 EBUILD selinux-munin-9999.ebuild 378 BLAKE2B 84ec865cd89b81a185ea307cb5755cf9fe2e7751c37647fe53a403acda3c53650b280b8bcd02f393aa65cddf1849549b8434d15310f46c21124ed17ccee499fd SHA512 14f4a31bc763fba316ff87aa0c4cb42625d82720bd31d89cb4d7022e48f587ca34090cdb005bceb58c0da906b9093da557678addfb0f1e8fe16654cc242bf595
 MISC metadata.xml 315 BLAKE2B 5b0a30d9351d16aa2e63f73393208384826c5124f4da01c7f9b30ad696ce81f2cc2bf311986266f4138de5cc1b12b6dad882952948aa60d65616a7b03588d40e SHA512 e8b021d51d8fe289205ff90c3b3a955bb6445d492aae83b48d269e0b5773b813f9ef4a54776588f4c0135dde15d59560f558cc1d11a4d0d62f4720d656557c55
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild
index 2e7095d4894a..ca842c4104b2 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20190201-r1.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-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 munin"
 
 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-munin/selinux-munin-2.20190609-r1.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20190609-r1.ebuild
new file mode 100644
index 000000000000..aa0755e10cbd
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-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="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"