Add /var/lib/selinux directory, needed for 'semodule permissive' support (bug #381755)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 130 insertions, 2 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index bbc9930cfdbe..deac1ddb331b 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.90 2011/09/02 19:31:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.91 2011/09/17 16:10:29 swift Exp $
+
+*policycoreutils-2.1.0-r1 (17 Sep 2011)
+
+  17 Sep 2011; <swift@gentoo.org> +policycoreutils-2.1.0-r1.ebuild:
+  Add /var/lib/selinux directory, needed for 'semodule permissive' support (bug
+  #381755)
 
   02 Sep 2011; <swift@gentoo.org> policycoreutils-2.0.85.ebuild,
   policycoreutils-2.1.0.ebuild:
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index ae473649d5ec..888e2128f686 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -9,6 +9,7 @@ DIST policycoreutils-extra-1.21.tar.bz2 12864 RMD160 28e5d0f52a69e0cb9c0d2e8088e
 EBUILD policycoreutils-2.0.82-r1.ebuild 2942 RMD160 1cfce90dabb327055b07bb5a16cb0a1e037d5574 SHA1 73fc250f3fc8afffc9e21b3aa0da276c1136f913 SHA256 c5296af03152194212caeae3186db3e80d1419a8ad4385dc257abc4e423571df
 EBUILD policycoreutils-2.0.82.ebuild 2633 RMD160 b8077adda572a73ed616526ec0ca97cc6038e6a2 SHA1 7d40d7119a01fa4e7fcbd3d68fc9aa43f8d97704 SHA256 852d23bfa05fce1e25a0c65c726309b2316051ced113c2b6d444c39ed19ffe94
 EBUILD policycoreutils-2.0.85.ebuild 4504 RMD160 04a4007b16077e92d452435b9b40a2a1c60908d7 SHA1 456f7393d04e397280b5603343eb3a6dd6ad95a8 SHA256 ec5bfdd9742b301af5053492434381665e3c9341543cdf5144f2e8034b79a75f
+EBUILD policycoreutils-2.1.0-r1.ebuild 4518 RMD160 4603f221727097ee14fd1b5abd8db103e08e46f6 SHA1 08bd27c1457d7c4b9efda100eef49e245f29c3b3 SHA256 8f67e222362e2eb4970d2fb43ba66fb93246dc7b99c24abe6a30f1029024a1cb
 EBUILD policycoreutils-2.1.0.ebuild 4425 RMD160 43824d74d208d73e1692e2b19cc1cdcda1e92453 SHA1 95c277e692d65a7d05813730a82f8ea8fb4d3682 SHA256 f982432a2bd6d15ffe1fc3316149f609e93c366148626a2c4055225920ec3b95
-MISC ChangeLog 14436 RMD160 7560e9616e088702aaf0feaa3ff125301d0e2ad7 SHA1 bc9772a885772f019c4ff09a60d67da60f6edbf0 SHA256 13e18a431330063ebd8d270060c13e09b0af23ae2fc1cfa005628d4dec2a9364
+MISC ChangeLog 14637 RMD160 b20c41a040b132be0bd2404e8cfd608a0a0452ed SHA1 dfd65f966ddf0ae780e92f9a177d2f78b17c0c9d SHA256 5d14d5541190c112ec35a3479ce923387de2708f7957ee0e9c3ce47b285c8d7b
 MISC metadata.xml 717 RMD160 0fc1c3cf181bfbe5d0e2c31e7c0db5f7a837cd91 SHA1 2ee21a2645c4e8e96e4714ba12ad0037631e83b9 SHA256 0c06ffad8c7c95b22992240c5fe0516a3e29a65ebe8da43e184fc2c8b08a1971
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.0-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..3acb99c8d611
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.0-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.0-r1.ebuild,v 1.1 2011/09/17 16:10:29 swift Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+PYTHON_USE_WITH="xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit multilib python toolchain-funcs eutils
+
+EXTRAS_VER="1.21"
+SEMNG_VER="2.1.0"
+SELNX_VER="2.1.0"
+SEPOL_VER="2.1.0"
+
+IUSE=""
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="http://userspace.selinuxproject.org"
+SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-sesandbox.patch.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz
+	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2
+	mirror://gentoo/policycoreutils-2.0.85-python3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPS=">=sys-libs/libselinux-${SELNX_VER}[python]
+	>=sys-libs/glibc-2.4
+	>=sys-process/audit-1.5.1
+	>=sys-libs/libcap-1.10-r10
+	sys-libs/pam
+	>=sys-libs/libsemanage-${SEMNG_VER}[python]
+	sys-libs/libcap-ng
+	>=sys-libs/libsepol-${SEPOL_VER}
+	sys-devel/gettext"
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${COMMON_DEPS}
+	dev-python/sepolgen
+	app-misc/pax-utils"
+
+DEPEND="${COMMON_DEPS}"
+
+S2=${WORKDIR}/policycoreutils-extra
+
+src_prepare() {
+	# 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"
+	# We currently do not support MCS, so the sandbox code in policycoreutils
+	# is not usable yet. However, work for MCS is on the way and a reported
+	# vulnerability (bug #374897) might go by unnoticed if we ignore it now.
+	# As such, we will
+	# - prepare support for switching name from "sandbox" to "sesandbox"
+	epatch "${DISTDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
+	# - patch the sandbox and seunshare code to fix the vulnerability
+	#   (uses, with permission, extract from
+	#   http://pkgs.fedoraproject.org/gitweb/?p=policycoreutils.git;a=blob_plain;f=policycoreutils-rhat.patch;hb=HEAD)
+	epatch "${DISTDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
+	# But for now, disable building sandbox code
+	sed -i -e 's/sandbox //' "${S}/Makefile" || die "failed removing sandbox"
+	# Overwrite gl.po, id.po and et.po with valid PO file
+	cp "${S}/po/sq.po" "${S}/po/gl.po" || die "failed to copy ${S}/po/sq.po to gl.po"
+	cp "${S}/po/sq.po" "${S}/po/id.po" || die "failed to copy ${S}/po/sq.po to id.po"
+	cp "${S}/po/sq.po" "${S}/po/et.po" || die "failed to copy ${S}/po/sq.po to et.po"
+	# Fixed scripts for Python 3 support
+	cp "${WORKDIR}/seobject.py" "${S}/semanage/seobject.py" || die "failed to copy seobject.py"
+	cp "${WORKDIR}/semanage" "${S}/semanage/semanage" || die "failed to copy semanage"
+	cp "${WORKDIR}/chcat" "${S}/scripts/chcat" || die "failed to copy chcat"
+	cp "${WORKDIR}/audit2allow" "${S}/audit2allow/audit2allow" || die "failed to copy audit2allow"
+}
+
+src_compile() {
+	python_copy_sources semanage sandbox
+	building() {
+		einfo "Compiling policycoreutils"
+		emake -C "${S}" AUDIT_LOG_PRIVS="y" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+		einfo "Compiling policycoreutils-extra"
+		emake -C "${S2}" AUDIT_LOG_PRIVS="y" CC="$(tc-getCC)" PYLIBVER="python$(python_get_version)" || die
+	}
+	python_execute_function -s --source-dir semanage building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation() {
+		einfo "Installing policycoreutils"
+		emake -C "${S}" DESTDIR="${T}/images/${PYTHON_ABI}" AUDIT_LOG_PRIV="y" PYLIBVER="python$(python_get_version)" install || return 1
+
+		einfo "Installing policycoreutils-extra"
+		emake -C "${S2}" DESTDIR="${T}/images/${PYTHON_ABI}" SHLIBDIR="${D}$(get_libdir)/rc" install || return 1
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	# 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
+}
+
+pkg_postinst() {
+	python_mod_optimize seobject.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup seobject.py
+}