gentoo resync : 10.11.2017

8 files changed, 175 insertions, 6 deletions

diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 5d780e2f7048..e786e5f0c472 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -5,14 +5,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-2.20170204-r1.ebuild 4283 SHA256 2045c7040354e213bb9883cf2399e2aabe76919c3eb525b66b145cc732c8fb56 SHA512 5f9d15c88c71d27f9807a410a4d08b7324b7cd3fb21a949593742752647f0350ccc7cbb6698f6a4ba10c2646ca03ff288bbd1b53c09b7213d56c6cec51ee81c6 WHIRLPOOL f75fb9abf90af37a931af9148d20b1b8b6960ee3a2da3295ecb363943c5b71b8e89539609362262aecf2a0e726610fec24496f94914ac7053633fbeed505ce2e
-EBUILD selinux-base-2.20170204-r2.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170204-r3.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170204-r4.ebuild 4281 SHA256 d74bfd175b58ab297974da77a10104f3e594b3da79f19844074a372bf6c43686 SHA512 1828b6ee088a07ed84a34cb7ae73f8199a1e31856020911b9e1f7b7bbdd430dc409ebe74f49b78fa5690c12257dd0bdca6074455d065d0a7607400ae358fa24e WHIRLPOOL ab712a2fc705a9d410e3552b36a44a109caf821e4d61854aad3ab85b51b1b35bd9a31d2c7bdba5569649e60894ace0a930860a1a9a3ebc161c625cab42dfa9da
-EBUILD selinux-base-2.20170805-r2.ebuild 4228 SHA256 ed5009808215ce4f90999cd5ef7d006d3b5a9bb07f86edade0e191d8fa289afb SHA512 8fb4b06682a8f670f15577f826054e5baf2c51c566adb38922325265480b8d24fe72deeec30e267e26656279925b41ef7f258c522a4f96bf39f30bcb77e7093b WHIRLPOOL 848b511335992deadce5065cffc051af5c81f8bdf25981e5d006b0074aab6be19237573b5ad4718fcdb5b745d25f1db3f31cbee16862a4d4a7929e0f678124ed
-EBUILD selinux-base-9999.ebuild 4230 SHA256 9f3f1ce2ee37bd9bfc382dde0cc00ff3a4d0e80bc6a30fbcf3df2182479179d6 SHA512 d4d46d31b3a585529b086e6c2f3d3f1d291dbce76795e18b95fe40bbd42624e7f5e3530ff73ee822d0d7f22e6792e57503c665a59e60c03b11816e4c9c7a55b8 WHIRLPOOL a54618eac096e829e2f3c40ec9732d5cb25181a9d3a3496aebf5d687db556ab10f0a35007ea90abb94312e705f96b4153ea7549ea23b61ff90fe567d9ddf8e01
+EBUILD selinux-base-2.20170204-r1.ebuild 4284 SHA256 1bad95de192490f0a98f3ba4c3de03e03fc8c72ee4b8909123daef57f62766f0 SHA512 a33229c688249f633db2a8279a236d141b8c3958381c180bf2072982773dbb02750f108df855afd4e1ec04eca660ae2d42f492b57cd3ff01e60bfabaaefe331b WHIRLPOOL a92fb098445c19772cabec225516aaaa2b1c429b6e70d1723c9a4a4081895f0fdc69a30eade382a49dd174918b8dc702060fdafbd6cc2546ca724bd7d2f2aac8
+EBUILD selinux-base-2.20170204-r2.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170204-r3.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170204-r4.ebuild 4282 SHA256 293bbbb3cb1672ac988b40cb9895f4b96745193affe11f086a57dafba554e696 SHA512 afb5b7d59305173fef1a5e44d8bd67d97bb0c9f3c2546f9dfc33c63fdeb48dd97468c8c7f3ec7c8eab458c490298199e306bfa327034a21983dd03e6d78bfce1 WHIRLPOOL 7292209abd9060dce10ca8f2defb2e8171540c47a471dc49597a0f55e95187b5b06fc8f86663335e66c0e6df00770f34e621b231f35725b3bf1714239ac07ea8
+EBUILD selinux-base-2.20170805-r2.ebuild 4229 SHA256 1ef02c83583f91719096c2c51ce29508d867a16d8f05184259da3b24911cd50d SHA512 d3bd2b7e545472924817350746d5fcc086982f20ba0108caa49486d9673debff82be89cefc7fc61584f621a50259c3bc7a0432bba1d7778c958f942193e87dc2 WHIRLPOOL a03cf7333e08c4e469dfa5a6f05d39c41ff8c046f4c4ba7e5a5072efe58dcc111ad4fcbbe5e48bf16e9c8c157194456f63a48a1f84576a1132b20994390fde46
+EBUILD selinux-base-2.20170805-r3.ebuild 4231 SHA256 49cb98cd59102868e3569a73a149b65fb1725db2162641f25c146ae7e946f583 SHA512 95efa50852b58394c254efea11aec254bf211c01bc1187c9d34131869adf90540650aa9eb43994020c37677547a51a100ae083d04386e6fc23e46f33c4cccfe7 WHIRLPOOL e945aa86c7d15c566ab13545d03abe3ddfbf50be5f55e7363641954a4a553e3d3dea437dcf4985b79baa32f0ac0f454645b90b6ef1a72a9ba52b74d71c338122
+EBUILD selinux-base-9999.ebuild 4231 SHA256 49cb98cd59102868e3569a73a149b65fb1725db2162641f25c146ae7e946f583 SHA512 95efa50852b58394c254efea11aec254bf211c01bc1187c9d34131869adf90540650aa9eb43994020c37677547a51a100ae083d04386e6fc23e46f33c4cccfe7 WHIRLPOOL e945aa86c7d15c566ab13545d03abe3ddfbf50be5f55e7363641954a4a553e3d3dea437dcf4985b79baa32f0ac0f454645b90b6ef1a72a9ba52b74d71c338122
 MISC ChangeLog 11474 SHA256 720edf02c93409fbf9f47d7227c521f237ca176789b2711aae7bec4445b23343 SHA512 572f128ffae5796642e7354c582bf2e83a5e0046f990ea8cfffc0fba483308ef14e8dde0dfbb8cda9774dcb7034d6fbdff0865738b94c5eb034296c8ad761508 WHIRLPOOL 0875e083554ea6fedb09694dd5096f1c25d19eab1390775e2803a8598fdf86250a1683fe110c6f5c41a0668d702252350dcb8eb084a622aec0beb4316d0d516a
 MISC ChangeLog-2015 12707 SHA256 59c70e3c1b23f9b8bb615a42f32f8da9ea4ccebe10908609dba01e88ff37d018 SHA512 c8c7770c1a1bdf0ab26ccf02f4195a4415f7db5251b5f38b0e04465694958bdfacfe7deb3b1bed7a202714c97fdd5a55a61ee2c46589a2f54603884aaa88a8b2 WHIRLPOOL 8f671f10e665bb3ce1b78503b736d480e3f5f5deaa1a764d9f11d0126e94476e0f88e93e82481a25a3afb54b83ff50fdd133441a41e3c095973e82a83ecbc4a3
 MISC metadata.xml 839 SHA256 05db545aa93b5c7597fec186f3e2bcb9062ed9008c6e69946586a653a3c45c06 SHA512 330017a98a3f9f4e6d6004955eb939c8d9c1c92fe6d091f78cdd7d2f6a02838c67a8a3268f38dad7df27f909ff51dc295d5de748f9767a257b5dad36c74d921a WHIRLPOOL 110e3f9d11169d733dcae7f5acb5a08f1e3170f3f7ee2dd9899b42969b4c4774279e2d07dfd5f49b0844a7c07812843ef6490b97759713be6c8709b96c0ecccb
diff --git a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
index cd02886e86f5..e868d90864de 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r1.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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/selinux-base-2.20170204-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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/selinux-base-2.20170204-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r3.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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/selinux-base-2.20170204-r4.ebuild b/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
index b96acf9ce544..71409d1bb6cc 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170204-r4.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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/selinux-base-2.20170805-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
index 74380e8b8f9e..c2ac18ef37a6 100644
--- a/sec-policy/selinux-base/selinux-base-2.20170805-r2.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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/selinux-base-2.20170805-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
new file mode 100644
index 000000000000..75f0679ab23e
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20170805-r3.ebuild
@@ -0,0 +1,161 @@
+# 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/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
+fi
+
+IUSE="doc +open_perms +peer_perms systemd +ubac +unconfined"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.3
+	virtual/udev"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.3"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		einfo "Applying SELinux policy updates ... "
+		eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch"
+	fi
+
+	eapply_user
+
+	cd "${S}/refpolicy" || die
+	emake bare
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities" || die
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	if use systemd; then
+		sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to enable SystemD"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy" || die
+	emake conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}" || die
+		cd "${S}/${i}" || die
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+		emake base
+		if use doc; then
+			emake html
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}" || die
+
+		emake DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		emake DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			docinto ${i}/html
+			dodoc -r doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	docinto /
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/selinux.conf"
+}
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 5643a40494e6..75f0679ab23e 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-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