gentoo resync : 28.04.2018

3 files changed, 40 insertions, 2 deletions

diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 09b250315245..eeb02957fc04 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/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-apm-2.20170805-r2.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134
 EBUILD selinux-apm-2.20170805-r3.ebuild 811 BLAKE2B 3f3e419952481921f4e14e832134f5cd67110f47824c3478fa52ba52af031e58db2876bf6164e6f5ae382ca7b07e4e9d67d059d466dcaa0960eb0eb891992194 SHA512 300c7da3a2b0887cab82be2e21c5cabc3667115d3e0574b361992da0a5ead5946e5f9d288e1dc387c04c4f618d8526837b7bd7043f57ebaa5d41499dcdb68b3d
 EBUILD selinux-apm-2.20170805-r4.ebuild 813 BLAKE2B cfe761b3c6bd3bf7b798123f742e7833f156e9d10f114e9fce6236c7ed7cb434b1b4f85492300a48685c840b1f36258d37446637b6fe52b0d35bb86dc47346dc SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6
 EBUILD selinux-apm-2.20180114-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
-EBUILD selinux-apm-9999.ebuild 813 BLAKE2B cfe761b3c6bd3bf7b798123f742e7833f156e9d10f114e9fce6236c7ed7cb434b1b4f85492300a48685c840b1f36258d37446637b6fe52b0d35bb86dc47346dc SHA512 9633fea36343b9c84a6fce2bb8d69ce9f70c5a37946c5c65d069579d900afaff66298ee9714103511a11022bec3821c29b47134f89c00611d9914a99310504c6
+EBUILD selinux-apm-2.20180114-r2.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
+EBUILD selinux-apm-9999.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 MISC metadata.xml 313 BLAKE2B 909f5fce3d131c6329123f5e35a79476a45dcf4efd8a0ac47ae70abe6ee6da7a4816d42e85ddb22ca425259c296108762dc85e962d8f83ed3f6ad2f06b6e58f4 SHA512 9616055313d194ea536d3d633887c199e71a976f044e357de7da9da4e53b274105869f4c85539133d66ced469fab27d44524251bb389dbdbf3298d7799baec3a
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild
new file mode 100644
index 000000000000..a5f7f30b0e7a
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20180114-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+IUSE=""
+MODS="acpi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acpi"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+pkg_postinst() {
+	# "apm" module got renamed to "acpi", must remove apm first
+	# the contexts are okay even tho the modules are not
+	# replaced in the same command (doesnt become unlabeled_t)
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postinst
+}
+
+pkg_postrm() {
+	for i in ${POLICY_TYPES}; do
+		if semodule -s "${i}" -l | grep apm >/dev/null 2>&1; then
+			semodule -s "${i}" -r apm
+		fi
+	done
+	selinux-policy-2_pkg_postrm
+}
diff --git a/sec-policy/selinux-apm/selinux-apm-9999.ebuild b/sec-policy/selinux-apm/selinux-apm-9999.ebuild
index d389ead90e00..a5f7f30b0e7a 100644
--- a/sec-policy/selinux-apm/selinux-apm-9999.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-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"