gentoo resync : 10.11.2017

8 files changed, 136 insertions, 6 deletions

diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 7b308e025e17..bfac57c2a730 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -3,14 +3,16 @@ DIST patchbundle-selinux-base-policy-2.20170204-r2.tar.bz2 354083 SHA256 95a77b7
 DIST patchbundle-selinux-base-policy-2.20170204-r3.tar.bz2 342266 SHA256 c5d99de3af1a6aec5aced5c4776ee47e15dbf467e116daa9d2df6f69653cf1c9 SHA512 df46b785a17c633d6fcd063b48258a362a0df13fcb71fb699b6c19281f4d647db43639e08e083157fcd49405c5c38c8408534decff99536d28ada64e9192d130 WHIRLPOOL 703c227d4490d9ba291089ac425c1e2924ad28644e5e7fbacbdc43c77eb7df6eaf776bef52b4019316f104ba29f06f90fc6222eb43106f7a9d678cf369eaf807
 DIST patchbundle-selinux-base-policy-2.20170204-r4.tar.bz2 373731 SHA256 eaeefe826522eab8d11318ff319e43ed89baa26a1ea21a89555d38119a2e77c9 SHA512 93a0644440064d85db32c56a381478f8ef94824a04531e6fbad26dd79be02dacd939b804759db35d0627908ff653f8107e18c48858df458c80ae785d80374667 WHIRLPOOL f319cf44526cee2ffc9f920da03cd4d2679f0ab979c45160084dd1aa2df16e9a2f8541ab49fd50588c4dd76675feb73dab1b13d5de809c39ba92867567530ddc
 DIST patchbundle-selinux-base-policy-2.20170805-r2.tar.bz2 314854 SHA256 9bacb18209bfc2fc58f10403dd4c1d0d38fe1be9558234e4d7df664d9096f72d SHA512 1358db158945b82e0e41907e3919a6888564b4f15ad765f0fe2dc7bf284485c18d11c5502d598268e33b2163a6fa0be2a4029a8e9f774abfd4377031ee9afd32 WHIRLPOOL 27d114929e6aff27d9818eb5351242ba57fe8e5b2f661a4ef93903e1afcbff4e34edc95b5c8a3546027769f9d0f6ccdf5878ff8b8d20ac391b29ec34a07a7e63
+DIST patchbundle-selinux-base-policy-2.20170805-r3.tar.bz2 324834 SHA256 15fd073f54df243224ab08018a8c1067281e3db0a0d003750981ad8c3cb6d081 SHA512 62ec2e70397d06d464e95305a4c0699cc07063d879d986a74442955fb8076a00cbe4a4f7a3cda46876cbf2ad38189be06f0c05ce9698aadafa6e9f02a8daf668 WHIRLPOOL 068ca0eca80b5ff09e6566846583eb42b00e895170b55171d60be28c87ed8120618f3f24e0c12f8954aa53284ee8d9b3e74b4be014c7387b6c5aec98c6b30264
 DIST refpolicy-2.20170204.tar.bz2 709965 SHA256 5e4daee61d89dfdc8c7bf369f81c99845931e337916dc6401e301c5de57ea336 SHA512 30deabb02a5bde51c463e3e89988d850cff51596c2e72733a064245dec152ea46317eea79550dbe82a7a0d327ec0bcfbd9474ff8a902507392df0da00df6397f WHIRLPOOL a6b6aa1265f3e7e78c6e8012f0cb8098e0727e77bfcf8165866e876b41c18648711c82d87750c081cc49e89b85be03ef3b420a2df25269e2ce070181af308ec6
 DIST refpolicy-2.20170805.tar.bz2 740430 SHA256 045709f5e44199f402149b31c6aab9666bdb1540a5c5ed0312a46c90dedfa52d SHA512 dbb6809b028ae75296ad26d5997cc21d835c49555a0e37957cb39b36b144af6e817320073a29247448eba1876ab9e29d3956ff4456f1542b66ba38af459ec586 WHIRLPOOL 94320a34f0ae6a7a2c67ef335b9fc2007b55fdac282d6b602979571b8f47049535a8d0d1d1310e420f94aefaf95da065c398d4f724a73c74df52e8ef95209219
-EBUILD selinux-base-policy-2.20170204-r1.ebuild 3785 SHA256 af6ceeab3e25f151cef6b3ee8ddaeb832732458d9f48ed8d523b94681a8574bc SHA512 2fccc6f97fe7b550d1c1a801ea9f9093e80c16a5e07f1933e2d65d07b4779e11d24d33274a8b9c6f766e88d27b7cc7b4f9e718970cf6fbe85430500f06aec094 WHIRLPOOL 4badd90e88f6eb9ca7f0c325c1494d9f8dca4846b3f7ba3d4381d4e36e323da33bfeda92ca26fc895f8916735e0757d8a9b001af6382101fb248f1dd4adbd872
-EBUILD selinux-base-policy-2.20170204-r2.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170204-r3.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170204-r4.ebuild 3783 SHA256 308ae90be47da1992bbd462a11e00bbfddeca57bbb8d56606ba20e72424113da SHA512 42d4ec15e487bec67bd2fa375d0fcb81ac17e056a0e2216aa424e4c14ae04cb35a8dd10096e1d2491c806f9f59a9d3f969b9d75ff14e0aed69d39d803a3b8269 WHIRLPOOL 053c81a37dad887a9a27fd96000b4a36a6fb2980c539fdd516714e39aae1e3e88dbfe9eccac8d3899a6b4a61a1e0ba4ae778436dceab3d5690810439a1f5d8ce
-EBUILD selinux-base-policy-2.20170805-r2.ebuild 3730 SHA256 a29d3acfb65e135cb136cdb14648ffb08f34a1d616afbaabcc4efe29b1e94e37 SHA512 d74a1aad9f730e1d35885da00c9eaf247da3f65ddd2c1dcc620978125e4f817d89156269c2c93779974a5a4ed4321c895599d4ffa1f1df5397e5e16dc56909e3 WHIRLPOOL ec4ca0220a2855e2ff7e7551f2787705e9cb3a79bdcf0242164377d59fc9d9dbfd4acca9711bd80c1607855b1ff8e92f6b62370d5482c67ebc150ae20b2b279a
-EBUILD selinux-base-policy-9999.ebuild 3732 SHA256 68998a4b49a64b47f4605ce58b58857b4cf9073161dae4a45fc259e912a48273 SHA512 7a1ee4a7ff58a6a11561a08289d7acd10f20ae1d85f51aaa3426e809418e95d0a2cc1da3b8127109c2710c38cc3137c1238a0a9440f361e1c7d300cdde134355 WHIRLPOOL 7c481534b39f8ef2f5f5a22e9eaf62941cb0032737299349d43f5e296d3a5796ce2e8df554c6ce1b78266ea7b71761aefb6f4fdb0565c07921aec58c56b6f767
+EBUILD selinux-base-policy-2.20170204-r1.ebuild 3786 SHA256 61494586cdb50a55477acbfa4987572a34f949c43dc1288bf9f4a9a3dcadf7b1 SHA512 c9ad330b65b72d08a864877d563c5de522939a8a0a747641317b3cb70c8ba3c7c11a64d039011865fb4f012f9b00befffb2f7a729e1ba9965bac93b15e930bc5 WHIRLPOOL 1a77dcfcbd6f7aec1df6a5d55af68c4de8496d0094a3eecdc5cb79886ab89a4bf1c742098d2919d34b672fd4392f145936cb651f4fd384fa6df436d293d80a09
+EBUILD selinux-base-policy-2.20170204-r2.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170204-r3.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170204-r4.ebuild 3784 SHA256 51468f237a036a0fdf5e4e19e53d0d76f2f4228c765cd37f55744993ec2e65b4 SHA512 8fe89ca7392cff717e83b358535eb68126562f6a94fc0f8d2d3d0d4a991dc7fa6c28cde728c4a1a9ab5f78608f9931c91660c505abd7685be0dd7e8007cb189c WHIRLPOOL 72dfd103b807bc4ab2e6cd12c6e897a3af60631ec558eb81019df4114d1ed93bae146253db100bdb1764c88ca661d88d462529029045b28254184d7570a27251
+EBUILD selinux-base-policy-2.20170805-r2.ebuild 3731 SHA256 1b168de854d3e9128e507e7ae596e63a39b9461c4155558bc6dc26920b4c2855 SHA512 acf60b729293958f5eccdd45214b5aace93ed86b926511c802da2f6da75ec60617e00adb980dcc9873b519811130378bbf4fb25de6256328b701043a5bebd3d0 WHIRLPOOL d7c8ebd6e7d4dbdbe998e5046fb8a72d4670fc9025ebfb05193d1c23387ed170bd66042a00339628f738645dab99f4aad45ac64124fd85948285c5e663776401
+EBUILD selinux-base-policy-2.20170805-r3.ebuild 3733 SHA256 ccba3ef4ff3cb84008515cf4fef78355c32fcf21fe9c461047bffe5aa7533d21 SHA512 4718bfed0759c58ad9a115beb90b8769973985d3ca6e0cdb8cb6ab4afc16da4aa7dde1fea3b4d06ba3c8de87a8e394a905db076444c54d15e0a7c4b37148e934 WHIRLPOOL 0412e0ea9cc5880310655d11607f41b5a2690321c3949f45b5283804fa269853bdb226c4837dd01122457e55e86ce746726715f91d93cd029161d844066aac6e
+EBUILD selinux-base-policy-9999.ebuild 3733 SHA256 ccba3ef4ff3cb84008515cf4fef78355c32fcf21fe9c461047bffe5aa7533d21 SHA512 4718bfed0759c58ad9a115beb90b8769973985d3ca6e0cdb8cb6ab4afc16da4aa7dde1fea3b4d06ba3c8de87a8e394a905db076444c54d15e0a7c4b37148e934 WHIRLPOOL 0412e0ea9cc5880310655d11607f41b5a2690321c3949f45b5283804fa269853bdb226c4837dd01122457e55e86ce746726715f91d93cd029161d844066aac6e
 MISC ChangeLog 11824 SHA256 50fed5d43a2c0f20e25c4f80a094b5ebe9123ca086544faf4e21ade20ab2f819 SHA512 b15a5e70be0d28d1bba0a9f09c48365b66626af8ec208d43fb3f290a6b7721f6314235660ea40053281aa4cb2f599ddc67138dd8ac00f101d1f3c35a20f6ec55 WHIRLPOOL 5626440b3b5b09a482ca00db0611491862b1e1f95a04945f92cfd6cd6972c163054445828e23867fc5d95ae1a08f556210c3c40142f534b2247a4e1747141244
 MISC ChangeLog-2015 37983 SHA256 9afe421ec7ee0070935467542733506d95667b765a81d4a2d04499dc7119383c SHA512 94774e4537bde4e9e3e25c389f19a3b890325c1db062c81eaf10ad4d824416207945a16d4ea8e0a7990bd16b2e5b8f159d63987f73130cbed898a396d5553961 WHIRLPOOL f00483d2643d51b0986faebf2388337c06a51bddf4db20148b3df862002435ff01c909881051876e43e4b6967aa2ecca1ae5a309d88dfdc18a3575878b541545
 MISC metadata.xml 534 SHA256 54947d1696b3ab8c1191b2c2bee635415704f2ed8616434a66cbb089094dcb4d SHA512 d8340bec9d0ec0feb396b17b53a6d53e3caa7ddd1efdc5e5de07baf86592ad0526d08fc08908295cf18a915eef1c7429c72970d56967162b2390eed6f28c822a WHIRLPOOL 2ffdc514d87d9dad75ec5da7f06e929293793aa4ce79783aa819e4f8e1944345f02a74c759883510ef946c7e49a5f1a92bdc0ac637c505d03fa7ecf41aa554e3
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
index edbda7e12245..6782cb719303 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r3.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
index a3a8db14e5dd..dfe1dece31a5 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170204-r4.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
index 1bd217f0e7cb..c3e966881051 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r2.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..111bd5737731
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="systemd +unconfined"
+
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_setup() {
+	if use systemd; then
+		MODS="${MODS} systemd"
+	fi
+}
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND="-i base.pp"
+	if has_version "<sys-apps/policycoreutils-2.5"; then
+		COMMAND="-b base.pp"
+	fi
+
+	for i in ${MODS}; do
+		COMMAND="${COMMAND} -i ${i}.pp"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+
+	# Relabel depending packages
+	local PKGSET="";
+	if [[ -x /usr/bin/qdepends ]] ; then
+		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+	elif [[ -x /usr/bin/equery ]] ; then
+		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+	fi
+	if [[ -n "${PKGSET}" ]] ; then
+		rlpkg ${PKGSET};
+	fi
+}
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
index f659283bd427..111bd5737731 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="6"
 
 if [[ ${PV} == 9999* ]]; then