gentoo resync : 28.04.2018

3 files changed, 19 insertions, 2 deletions

diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 6a838c2b8253..8f75314156bf 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -6,6 +6,7 @@ DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 BLAKE2B 483d04
 DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 BLAKE2B ecc3b0425987aa648b3dd52977a6e1fd987e605fe302c3b6d8742d3eac9a1c89697de1f97331e9863b132bb95814ae7577e161a024cdda297fb84458aa9417fd SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668
 DIST patchbundle-selinux-base-policy-2.20170805-r4.tar.bz2 689641 BLAKE2B 1accfbecd4825a6cdb8c3c189c9e23898d1dbe8415d2fe26a842782dec634958f01861916a3c040740359562984718b61cee7af7d9395b125590931110e67eff SHA512 2067b090cd054e47d6496c9513d69a7a37a72de8dc873159a8055e27fe2380dc73006354d790c455ae893645f956c6be6d6ad2d30be7428ff8a442604a0c5400
 DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
+DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
 DIST refpolicy-2.20170204.tar.bz2 709965 BLAKE2B 7fb10d6054d74204f8c7d6d8ee88603f37b6600ed4a03e937a3a233ea7a80feef6ab90ba01af8d444fa79b266456260b14af3be0ad6a311baff6e3408af7d1ba SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f
 DIST refpolicy-2.20170805.tar.bz2 740430 BLAKE2B 0597f51fceb5ca88b3506aa16cbd2d7f3df3a1d9c6afdf4cc5fc7eca25fa19c5810889f90ed1ee0abef401d41384558abb69f6638caf50341f71d075fa99e561 SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586
 DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
@@ -17,5 +18,6 @@ EBUILD selinux-stunnel-2.20170805-r2.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a
 EBUILD selinux-stunnel-2.20170805-r3.ebuild 284 BLAKE2B 2e55d8674c878b2929f9699a0eaae8d2314799c60f8ebaecb2ee69181d979b151009a2fba2cc3a76df2ace1d87bc033f81f4392eda2c77ae512fb4195e49e176 SHA512 2950c1064ed62e34b7800a6ab13df0dcc08613e1de0005daeaf57fe227ed20043bf182d19e30745a7fc448fcfbb93c2c31fcce967f72a8673575edb692828be5
 EBUILD selinux-stunnel-2.20170805-r4.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
 EBUILD selinux-stunnel-2.20180114-r1.ebuild 284 BLAKE2B e1e106eb2afa0565f6ef00f3449b01c5ed0d3cd0510a5bacdc51414e1b79509a37333b97d29e766a2cb653616855aa83e8a3e0e0d65218c2c8db3791c664fb01 SHA512 ce2b9a4b4b19ebf96fd26246e3bda2bb2cf905f4bfd7e847d9572e96f392ec2a9042244e84e945c3f40970efbe44621d70a4b8b203626a06d9847cf2229502d0
-EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 26a462e3cbeaca21cef173281347efa24a4f005a27048432403264b3a04a91dd69a5940616a3a7cf00410aee95d183166539659979b5fedda19977ff8650c066 SHA512 55926f8e6420d0df17ddc27474def1adb95a9b09e4b1499c9bd0c16f96232cc3cb904df579c458a2599fb161fd9ae3d9fedcc7d40bb8ea580d22e6ff7646a2c1
+EBUILD selinux-stunnel-2.20180114-r2.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
+EBUILD selinux-stunnel-9999.ebuild 286 BLAKE2B 6e7d1771c5d1e11b635497308a4c6d1e34763c6bb73a968194c905d3f1111bd503340ada8484100b8dcfc42f0cb150b36cc3bf2c99bb769990f5df8023bc675f SHA512 6f124f6c44fd5b3c2a7cd417d083f54abb561b7df84eca96368c877ac8ee0320210483c45e34199433a31340088bc68bfa89404a9a5e798b9a134ce7644468fc
 MISC metadata.xml 317 BLAKE2B bf5e87f13017b76af0fba2e7cdc4723cc79907a563915448a9d079deadd4afec709dcb5700c9712298da4b912ed01440b19963eacfe053344865058a4640d463 SHA512 d9d1705ea1176d67de1ab424d18da867f135c5c385baea034322103ec6590bf34d38fc248205bde9aed697e367e2b4d529c039ca967663ddd0f30a3ed603a00e
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..6d44c6fdbaad
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20180114-r2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
index 7547c9eb6f3e..6d44c6fdbaad 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"