gentoo resync : 05.04.2019

2 files changed, 39 insertions, 0 deletions

diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 79393a33ec28..f429e09e8799 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -3,12 +3,15 @@ DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b3010
 DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
 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 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
 EBUILD selinux-apm-2.20180114-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
 EBUILD selinux-apm-2.20180114-r2.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
 EBUILD selinux-apm-2.20180114-r3.ebuild 813 BLAKE2B 02d4357122907b444873e6702f258db294a21f625aa35f2473d128cb7c026fe59058c5adbb76f03a2e89f5001e417669ab46ebc43ccad7647d282714026c8caf SHA512 5f16b6ff30e52a22050cf332487315598ec0830390a696bdc90e234d762c3686178aaeef3ed69768d5a4ac6e40346feccda31cc5b544970408ebb795502237ae
 EBUILD selinux-apm-2.20180701-r1.ebuild 811 BLAKE2B ee8ac809c6bbd3f0a55869c813f5e3fcb679f3cbb77c6099337ba805b9bf4321216deb83034580afa0b5549ef1c2150160954c5226fee496c27ef13395dfc4e9 SHA512 e4568748d776c019721a559b893db7b3b940854e6cd9be8d2631c1b2e4d17896b02bd0863a23aabf179e0f27a808bdf1d1cc97bdc07c587ba3e346fc81f05a08
 EBUILD selinux-apm-2.20180701-r2.ebuild 810 BLAKE2B e496dd29485668fa68cb7ba14141d41d97801fd72b425212cd5ed01f3063e2c163782367363a284751efc8739f5cfe23bb63c657d4e3824511699216b7ffc4ae SHA512 c995ba8ef467c10a6bd2eb8007c30a3fa9684b81a1f0d40378f9ec3f2bba30eba60ca8ee7a0cfa89d6cd825ffd74304116744ea564a2a4b7ed2e73aef311a13e
+EBUILD selinux-apm-2.20190201-r1.ebuild 810 BLAKE2B eb842d528340d70b1f62294640a3e99f7d4aa8298ba4c034dd31dff7506781d281a4d30f2c4dec7dc889535de0b6eeb1146e597300d11d51e231480f8199ea30 SHA512 2eba733bf944491bd926c5bcf50df27fd500872cb2a5b5ceb346fa5fd62d11fdf47c3d8f038c6844047e91292893d0f0d7190fb3212ab271dea3f77fb9ff8dd7
 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.20190201-r1.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20190201-r1.ebuild
new file mode 100644
index 000000000000..b51de45bd8d2
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20190201-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+}