Bump to rc6

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

3 files changed, 193 insertions, 15 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 2fc772cf04a7..1e83b86acaae 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.144 2014/10/29 17:33:11 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.145 2014/11/14 19:20:37 swift Exp $
+
+*policycoreutils-2.4_rc6 (14 Nov 2014)
+
+  14 Nov 2014; Sven Vermeulen <swift@gentoo.org>
+  +policycoreutils-2.4_rc6.ebuild:
+  Bump to rc6
 
 *policycoreutils-2.4_rc5 (29 Oct 2014)
 
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 8d84219ec7b6..aacd99de2c75 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -14,28 +14,30 @@ DIST policycoreutils-2.2.5.tar.gz 4948944 SHA256 bbf850a8c3c2f371f439d6525663eec
 DIST policycoreutils-2.3.tar.gz 4984980 SHA256 864cfaee58b5d2f15b140c354e59666e57143293c89f2b2e85bc0d0e4beefcd2 SHA512 3256849d13856ec47ac85470632a57e26952c5dafffb51df4eb8e32467196ff3ef725cc582798727fe45fd6284c1893d12eae2c89088ae1758ad39faec385659 WHIRLPOOL 1dd9bfd67ebb744b8c47144966f09d8361e9018e8d941355080c274b9ac891c18eb95771f3dc8b136683224bc5f12f3fb58fa00666b5815d65e7141c31d9293d
 DIST policycoreutils-2.4-rc2.tar.gz 5000679 SHA256 31efaa1d05e8fb50e094417e265dc0a125863e358938df9a4e19718d119af48c SHA512 a27b4bcf0f5cc077b03db9650909b7badecdd4f317ffe3dba0f7cabb9c5fd77a28351189616506d1806ed6c6b43577c3f16f306d157cf64c08827826c986cd6e WHIRLPOOL 1cb2f4f2f8f3339ff4632bb23f9983ab33390036e613f117004f0e5fcd16e1a04c834a7f4032295e9cb47bde5d43275647ad7bd19daf92fa96d43f69d62f1e28
 DIST policycoreutils-2.4-rc5.tar.gz 5003770 SHA256 f3063e732f29f4dfae7983e5ae503b35f1dd058bbdc94c2ba0b363c502978e3a SHA512 1b558f502833723ba7a1b7126a996b3498ae65f8452dc02a9313b5111b73d5c8854366698b23e489965d3de63d57820c822b28a53fa6b833c967e28545cf5955 WHIRLPOOL a08bd959c29daabdec0b3d3e0775b54e9b76ead45cfe5a4836d3271f6f8fa9ef37ef411f75df52cf85c306f119f94cfc0cd3e77f3bb4e6856012513b78485f6d
+DIST policycoreutils-2.4-rc6.tar.gz 5004643 SHA256 192efeee0e4f83c2aca59b53e7b4b40bb4b5980d9dcf95b17b544e244a038316 SHA512 4530f5b138ea30c2d3f033bad70fb31be54957b83742cea587c76756010669011c862c9c4090d52ea8ba9f3ed9a3e31cf6ac306355cfb12dccb4aea576a758d1 WHIRLPOOL efef6bf91d04a0c07091e4a538c23d1e11cb60e593592519b9cd880d6df4a98b7eb1ae13ba671a879cc7a1cc6460829f8b99665663cb04f9c62d6def0cb51716
 DIST policycoreutils-extra-1.31.tar.bz2 16080 SHA256 ad0a78d96fd01aa51fe774e1701bd23934cd72182b2bad68112006f0ea17cc7b SHA512 520f93f1a2ce3c60a1d192b09cb9a968d207fbc6ab1f01861be95a50b65264f706335620ccbca48ce38f81581a4cf5128e5db9e5b0564460c9f05f04038abfba WHIRLPOOL 56e713b9bd8f1af1496f383f45f1ef8d373b3f45148237bfd28c016f4becaa87d932b363d165b46c657ea3a08503e7bc60b1c5a5a2a814a659770bedf33d4202
 DIST policycoreutils-extra-1.33.tar.bz2 16191 SHA256 743c3930277102f5545907314b21e98955e88be7972e30264c6cb5dca370b788 SHA512 3f6f19ae33d5b1043f2979fb3e79bc061767f7051cbd0981e5c5663b4391fa29544b2184b384c9fce7b4100623bc776748d77a01865dcee78b0756d73ee10886 WHIRLPOOL e74b9c3a6dff563b81bf3ce85119fbdfc658191ac063763f2916a7dcd90584f98cbccd1d6cd5ef3aecb00366a82c949c62ab9b907cb98800cb53d3e9ab63b492
 EBUILD policycoreutils-2.2.5-r4.ebuild 4708 SHA256 2287c153ef9ce72a15e1fb0d681942c79c26393dfa00436b414389334606b5e4 SHA512 d69a0cd51e9e995f59535e6e72a3e62d4a5e3f75aeb8a98f9e6dd6ce7f02b4ca19d479395bcfccdeba7b932c484bc90308a3f563d621c0f3f626c4aa5b927c5a WHIRLPOOL c34a44c55bc221274f3f19e8f72fbf1d649b16978d6d080ff66ba47185b0bc7e069431a818ebce1fd23ef590f656fa23e86ebef42bca870050ff2a792bf20072
 EBUILD policycoreutils-2.3-r2.ebuild 4348 SHA256 46b1814453fef44d27a90c818d4948e5a448967b5b3305f71017da9788ff18ea SHA512 8ac7acafb331a746ef03bfb016b098425cd0c6f25fb02b20c79f22d4f82a97cdd4c272f27a289a0172b375002a6a3bc3f1f4e4b2f27d6fba52a7bc26819ff8fd WHIRLPOOL 41bd78021c5ac52e4778d5b0648c8af6f5e40298d71446486e2b1ed5da9183c4b8b337850b59f1a275823c536b4eb22800dacfaf656911a5288d61ae65d35d29
 EBUILD policycoreutils-2.4_rc2.ebuild 4638 SHA256 c0f8968dab68ec2416d57d2f9c108c4b1d3022aa4a86b898b66464cfb40d4dd1 SHA512 f3752c8dd9d17dd4c63167017874bca10c89aaf212d25a4ca6e1af40c16040e07911fb9424e3ace8c36f97771fe900270b7fdb6c1770b470d5d59d1ed043b7ec WHIRLPOOL 950f86835caac5dea85057b262976fa7009d51be9bf6ae8ecfa2b32cd38c4a2cbb0db34c05dd565df399598fa76399608fc7301e32e60f62e3a0885b6d367621
 EBUILD policycoreutils-2.4_rc5.ebuild 5545 SHA256 58d31584e99055cb2d8b79bdb79478b02113f965ea775c160fe6590917d29e49 SHA512 9ca53f582efeda5ee5c4a3a126cb662c1b1b382601cfc98b1de4116f26a7622438d988007a9474c847ab90205779ec7aa628848b89123e73e5a9d39b4631237b WHIRLPOOL 4e1942ad4fc80b33309173645901a75fc7e66fd4b5343f550583f596e631fdca5343155d40a9b483350935b4c9634fdea7c991e0447498768bb665c0456dd85c
-MISC ChangeLog 24740 SHA256 155a321488d21c084bf2b520954e3fda085599e59bc9550429e47ee58a325574 SHA512 42b504a4f46acf6bb57dd985e93bf97a4ae8a538bcab9687b30c2065e3f2df2b7a3681afc8a5357fdb3c347e721a8a2a79e342fbce5d9abdd4675cb4d1c7875a WHIRLPOOL 0a3443736fdf8820509aaf3f1d05aa58899645a92c262bff84ca4512bc3e0f9d0716041cb9936ca2155829c6d481fc63de82849197fa8c04d5201daabb7dee4e
+EBUILD policycoreutils-2.4_rc6.ebuild 5545 SHA256 7e017aba8197f3c8e7774ff8f137c3b3bf64d8d85d417ee03a444929ffa27bd6 SHA512 9120dabad8c12a6af3862a5ee2fa564b3ec232a12d5449fe854e620f38abeb769c1db25c3a05dea3cf55ce2a305f58399bdb68d4947982e770b75adbc0cb7fe3 WHIRLPOOL e209082d76393122611b633e9b27f35825dd1cf07993cf7fd9684139831600cb3ab3884738981549d7920ea5ef3a88ed95b709c105a973a4887a644aa2a3d9d6
+MISC ChangeLog 24879 SHA256 f6d0f39a7ac066d5b933fadfdce6a4bf1710daec8b5649fc0c164f6eab341f32 SHA512 d6fd2434ff7c0c1c6f47b8cb3221d1298c86f30ced1efe8638bf192686ec0703cd550a13c59debccffa64d29f38a4c17899767967af25b64d808159a4d1d0f79 WHIRLPOOL 48cf85b0387a5edba258f02c72431c523dbfe416637b9dbad425d50f1fa1f12fd8932a9637f41dc7122b9dbab09c054eae6df999ccb3aa0fbce51e2d894660ac
 MISC metadata.xml 971 SHA256 9d2157deddd1a457ff3d7b1232ec23e71367852b743ef6b4b8290349c3c9c698 SHA512 79fbbb6285a75f84fdd103ed704d62ede2695e7b8fe03f989ac4a065261a5e870675c1186173c1d4a65b88ac98f8bc2153146010513926e1a1b53efa52564a03 WHIRLPOOL eadde5fe3a3a2a71031d46f7e7c602f8069138914e62c44dff4be09afb8e23391a36d7c358a011722151437ee51be9f404ee1360a2d918078de3f783ff7e062f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUUSRXAAoJEC7dUkA7aK9HMDAP/0eJQkx+KJHv3dZhDnpvXIRJ
-BcLUpFaksSuXlL6TVFTPWDX2vFhHHd3uMniHGxNoRYPqA0SWY5z5H+G0T0U4bkRG
-AWu+hp3QolVSL0d4pBT34pznvk3PjG2yG1k/IX/CapBF635IhKbVvl1vsjkRP3su
-8vPRxF47pr6cdtufsRIqbYDEvLbwgHd89hdnK3gUsPLSswld4syEcAFj5HYPJEX7
-e9EAuFoBVux7tWTZmGjBxnSLbRkmHlW5705NWUQ2Rh2WTiZdQeuvSfi7/LVi8G7f
-Q/uSNXO+NPxn/1GqYmzxOQQH646PCamWnOTWJzx4jRBAuE0HfuaEUYoJH0q/x65X
-KzLZMtjwfJhXs3J5r8yog8bCGgnRpaueL8Z5DExDvqnf1DxsWU3dTDJFKjjPLG8u
-wZ49vRoP4QjlwCDxcrh8mM8R52rvgiJDVCRxh5E8D2u/htSV6E64yiaSDsBuvxEM
-j3DeA0v1t5r+80BkIwsiUmCjq+PVrRxm/iFJ9xEJjjslgAy/NLcwu41aG19vWyKM
-BKHPbaj0x/TgtPm1NiUpa6ZY4IgRCah8gwczu+PPkUb+Jg5Cb43B/mgwUcVz6UaI
-xeu9iuFfJEjr15c5V+9ECxQOItgUjnDXUKeiMLJFDoEg0rTbBOqyqYzXCbdKXiM2
-U5NJsMMW7SFutqVsgFTM
-=lc2K
+iQIcBAEBCAAGBQJUZlXvAAoJEC7dUkA7aK9Hy7UP/jLKbN4wTbXAMMJq8Mr+w9qT
+qlviij3d+E97DaoFZBWgGjyEI1FgDPrHGSCJssr6NEy+VTfpM4+TWb60mUKy4kN8
+b4WgmiX8kuC6zBPlNO6YPKQ18VC25IKNQVdpiUeEl7wexmFhWQumPSB7iMFtxHIv
+ZKdalXXyAWl+3BCms2TYOV7BhGVP8nZTPpCre3Dzk4/Q0+K8tOH8uU3/gBDk3HRO
+GLIMa8aGAbMtmQ5dqYDoPMLSPqU6crgkLeRnYMHlvW7aWVoWf8s4t3SR1ekThHqC
+PTQH3GyF5MVLVLkd7+sUqJwnBX4FrkJZBhOMiPOmM14N9+A75bQKcjND4UixvBt6
+bDtGv1b2nqPj+lVGArpBHh6aGJhSJi1iqH2ZpaBsiYO5QY7B3PU3fVCFmk/vduj9
+g5OOPi4dqXaYYVjPeRwSLq9mMvLREj33ZT7L+Ilkd2rF81nvrqJfXYYZeWZTVnkA
+cB+D2UuCVsiwElWgtdikS58JZDdCk1fBaLh60pgpSJtjsORCbHt5HAiq8cD3TNnR
+Af4O3CbxqQsajqBrv0FBcAeKfqeCoc6kaDZMTvMPv58qiy5Xh6sdQLpTUT5M4FjL
+FXGfNH7AFWE1+TTmwjhvTxa84+FmMffecwa9TerAtyk2lcnZQxy3j/76Pu1sNgMX
+r240IqidMMfxOXvVWJKA
+=JiMI
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
new file mode 100644
index 000000000000..757ade350e04
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.4_rc6.ebuild,v 1.1 2014/11/14 19:20:37 swift Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs eutils
+
+MY_P="${P//_/-}"
+
+EXTRAS_VER="1.33"
+SEMNG_VER="2.4_rc6"
+SELNX_VER="2.4_rc6"
+SEPOL_VER="2.4_rc6"
+PATCHBUNDLE="4"
+
+IUSE="audit pam dbus"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140826/${MY_P}.tar.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-libs/libcap-1.10-r10
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext
+	dev-python/ipy[${PYTHON_USEDEP}]
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	audit? ( >=sys-process/audit-1.5.1 )
+	pam? ( sys-libs/pam )
+	${PYTHON_DEPS}"
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+S1="${WORKDIR}/${MY_P}"
+S2="${WORKDIR}/policycoreutils-extra"
+
+src_prepare() {
+	epatch "${FILESDIR}/0010-remove-sesandbox-support.patch"
+	epatch "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
+	epatch "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
+	epatch "${FILESDIR}/0040-reverse-access-check-in-run_init.patch"
+	epatch "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
+	epatch "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
+	epatch "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	epatch_user
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+
+	building() {
+		emake -C "${BUILD_DIR}" AUDIT_LOG_PRIVS="y" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" CC="$(tc-getCC)" PYLIBVER="${EPYTHON}" || die
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	local use_audit="n";
+	local use_pam="n";
+	local use_dbus="n";
+	local use_sesandbox="n";
+
+	use audit && use_audit="y";
+	use pam && use_pam="y";
+	use dbus && use_dbus="y";
+
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" AUDITH="${use_audit}" PAMH="${use_pam}" INOTIFYH="${use_dbus}" SESANDBOX="${use_sesandbox}" AUDIT_LOG_PRIV="y" PYLIBVER="${EPYTHON}" install || return 1
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="${use_dbus}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d"
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	dosym /$(get_libdir)/rc/runscript_selinux.so /$(get_libdir)/rcscripts/runscript_selinux.so
+
+	# location for permissive definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+	  python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	dodir /usr/share/doc/${PF}/mcstrans/examples
+	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples"
+}
+
+pkg_postinst() {
+	# The selinux_gentoo init script is no longer needed with recent OpenRC
+	elog "The selinux_gentoo init script will be removed in future versions when OpenRC 0.13.x is stabilized."
+
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' /etc/selinux/config);
+	if [ -n "${selinuxtype}" ] && [ ! -d /var/lib/selinux/${mcs}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. In order to continue with"
+		ewarn "the 2.4 userspace, please migrate the necessary files by executing"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store. Warnings about 'else'"
+		ewarn "blocks can be safely ignored."
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+}