Fixing bugs #424627 and #430262

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

3 files changed, 182 insertions, 2 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index edc595123a99..ec550499b7ac 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/setools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.78 2012/07/30 16:33:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.79 2012/09/08 18:33:38 swift Exp $
+
+*setools-3.3.7-r5 (08 Sep 2012)
+
+  08 Sep 2012; <swift@gentoo.org> +setools-3.3.7-r5.ebuild:
+  Fix bugs #424627 and #430262
 
   30 Jul 2012; <swift@gentoo.org> setools-3.3.7-r3.ebuild:
   Stabilization
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 0193cac9cab9..3df026d9233e 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -2,8 +2,10 @@ AUX fix-check-role_set_expand-libsepol-2.1.0.patch 1150 SHA256 8b9bcb857a77ae446
 AUX fix-implicit-def-fstat.patch 441 SHA256 3d0c55580056353ab3ca575899fb8f669d0b7a3f00f62dedf3a643a7e0ea8a9b SHA512 f9780fe4ff1e637ff6c2669fcc2cce18b269eeacde30064dc92711d6c4fcfe177e6d3884fd5f88db2e67ea803fbd32edc8f524f33103c53300c4477a8cf24eb4 WHIRLPOOL 766826b2c2564fd1e59af137ba1a57ca89eaa21e7d7462546780264b26f34465424c43789d173d1124a2534a4dc67a682857733f0436096efc031611b23fb25f
 DIST setools-3.3.7-01-fedora-patches.tar.gz 29858 SHA256 a36470e934f4b9bd8c61e8a25d286a4faf852b261dc3b3d55bb547f54efb6cea SHA512 fd47aefe876721f255f87d5b7180b8bff7b255b7457e359a406b344c549299c74592123010e514a27bfcdafe0ba6f12c351abfce0eabbd9aa5cb8c86cae75293 WHIRLPOOL ae547db254fb010834136e4b8ae41a6d742524eec7aa1083453cd4b204b02a984687d20aeebeb6e2160d7ef21f3355371e751bc1a08d971ab4a90a857886db74
 DIST setools-3.3.7-03-gentoo-patches.tar.gz 5889 SHA256 bcca7a53655a351915771577f802d3af60791c39da94cc819d3ccef49ae552d1 SHA512 bc7983cbe7d743c1e76333ed05af22915a7758176b88d2bffee27802b9a62b6de2feb440e4e472f2b8840338c2e2d9e01e3db76b2b3ce86a3d8b6e4f14db0569 WHIRLPOOL 30ae0cc9a328940f1866e4f0f79a7f1df02a11c3665023e6a2e928cfc248ca3fbbec8f5ed0a7968955c1597509fd4922ee060eae05c9bf7ad4c9383cbedf82c6
+DIST setools-3.3.7-05-gentoo-patches.tar.gz 35221 SHA256 0e2c9bf22009a67a616d45eeb17f49c72d0c29af702884178341f61b24309a5e SHA512 6591bf07be3f924c7dca2386b85b93becaeb1d2efff360ee0edbea16aec1ab1363246850468bdc3a4e9745ccb3d61c332681f5f6d37a0bf34dca33462628c226 WHIRLPOOL 7070e3e3cd1dea3b9457f33ccac66c935025970648f4afe0258f879f8cb5420b0e0d2a1f2449332315fb3d15abdf6380a7528dfad8b678c643ce77ee3b87bb3d
 DIST setools-3.3.7.tar.bz2 940657 SHA256 2bfa0918746bdcc910b16b26a51109a4ffd07404c306141ada584cb36e3c895a SHA512 ae45a8ae11a3b7952da61b6b4c51adbb6b1b7caa6b15fdbfa71f6f150b6bc55d2d918e9e7720f868b4f432a5df6ed35d63d53a1c7640f015d9fa9c415d6e6a21 WHIRLPOOL a524e948c804a268c5308c1b544552b295e954d98a6fbb606bce2bd3cf33d37ebd3a0805226396c70f03d895a9ab8403d9ceeef4dd0117097851bb2ebb7660a1
 EBUILD setools-3.3.7-r1.ebuild 4297 SHA256 93f8e6d0e377fb1efb48495312a9732e99766901b4895da0562ea9fd5e1e0294 SHA512 0ebde8932bf65b1bd06401761238029c11358c5b990d49b414445b227e4277620df1ed62f82600ff4b0fbe0b05c943fd0e88c43a902a7d91a9b168c12641e04b WHIRLPOOL af203d89bbbacb7bbc095ce48c03302380c30075959f7386d2c45e04674f5f2c38167d40b0025234b2573f2d5a16976a18f76b665547085c3635db8322fc8646
 EBUILD setools-3.3.7-r3.ebuild 4907 SHA256 e53cb13a5ebe4e87432d3f18ad099fc0e9616a2339ef1973c78b11e3d4988774 SHA512 24593a56d6c5f16961e65a06ebc92035377976d5c967c8406ee25d8a6ff281577038d7d59e0bb75149d8eb96b891cea03422f731ec95d0ac5bc19940e1d2dd8e WHIRLPOOL 80deb12f2a5edff7b325290368af5f5a86110dff2baf49f031a7edaf610e50e416efd77aa580cdd67d43982e11c3cf805e4117b8dd88e318367c84e49a694624
-MISC ChangeLog 10604 SHA256 3205b91d1618ca51bfab839e7de99e2968e32ff961a552d8b8de56f5fa7891f5 SHA512 48fe5d425740b4ea4e2bc61098018082832b3a679bb475cbce7d3e6b8116e6847d10eca5138d1a400081df059e43c3da5f574316d104b6ea3b8de3cb5bfaa3b9 WHIRLPOOL d04a0ace555beda9a505adc2c0b0af883b89b6977ae6ba62e439855072e692abb9c6f31ce1d4a3e0ab73325b82c55930127c46a6a2c7fe8dcd8f799894336292
+EBUILD setools-3.3.7-r5.ebuild 4909 SHA256 671322711a50996296bebc4763ff2ca0fdd3368df3640b0bbde06c308845b15c SHA512 8cb479844db62922eacdc2f7c537afc0f0df61c86209b25d2ab236098cd6890b29354ebef74858fb94dac0ff4e70a7fe554c7ba2e8fc9fa60faa49cb37ab7356 WHIRLPOOL 87b1433bbd46cbadb94d8132bcfd9d032a736518bb36ea887281674f683c671ea66761ef84744bf2e758a6699963712de919a6d34e47513605a40e9e2e7745e2
+MISC ChangeLog 10729 SHA256 750b33681f0d844e3738132895686b13a8027df631a9ab3e931d4bfe02d09a40 SHA512 1b67f840fce4981c313220b4c723048d270d6ec4cc1a750149e825ecd9179ee65ad630370cd11473c4a5b384605f772f6c4635429e44057d5c1c72de82661ef0 WHIRLPOOL 5f317f608368a15d528fdfdc0212f8cfe1239c32dd4af3d71580d1e7b3051a2cbe2539141abfbe2b9770b80dc6d041509df6adba54d5d0125fd62cb63ca5678a
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
diff --git a/app-admin/setools/setools-3.3.7-r5.ebuild b/app-admin/setools/setools-3.3.7-r5.ebuild
new file mode 100644
index 000000000000..904539d466fc
--- /dev/null
+++ b/app-admin/setools/setools-3.3.7-r5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.7-r5.ebuild,v 1.1 2012/09/08 18:33:38 swift Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit autotools java-pkg-opt-2 python eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
+	http://dev.gentoo.org/~swift/patches/setools/${P}-05-gentoo-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		>=dev-lang/swig-2.0.4
+		>=virtual/jdk-1.4
+	)
+	python? ( >=dev-lang/swig-2.0.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	java? ( >=virtual/jre-1.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=dev-tcltk/bwidget-1.8
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	if use python; then
+		python_pkg_setup
+		PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+	fi
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Disable broken check for SWIG version.
+	sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+	# Fix build failure due to double __init__.py installation
+	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		# Python bindings are built/installed manually.
+		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+		# Make PYTHON_LDFLAGS replaceable during running `make`.
+		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+	done
+
+	# temporary work around bug #424581 until automake-1.12 is stable (then
+	# depend on it). Need to use MKDIR_P in the mean time for 1.12+.
+	has_version ">=sys-devel/automake-1.12.1" && { find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} +  || die; }
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+}
+
+src_configure() {
+	econf \
+		--with-java-prefix=${JAVA_HOME} \
+		--disable-selinux-check \
+		--disable-bwidget-check \
+		$(use_enable python swig-python) \
+		$(use_enable java swig-java) \
+		$(use_enable X swig-tcl) \
+		$(use_enable X gui) \
+		$(use_enable debug)
+
+	# work around swig c99 issues.  it does not require
+	# c99 anyway.
+	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_copy_sources ${dir}
+			building() {
+				emake \
+					SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+					PYTHON_LDFLAGS="$(python_get_library -l)" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)"
+			}
+			python_execute_function \
+				--action-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				building
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			installation() {
+				emake \
+					DESTDIR="${D}" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)" \
+					install
+			}
+			python_execute_function \
+				--action-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				installation
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize setools
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup setools
+	fi
+}