Fix bugs #436338 and #430262

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xCDBA2FDB

3 files changed, 187 insertions, 5 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 38d65938042c..5e9c0fd5b176 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.80 2012/11/18 08:49:57 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.81 2012/11/23 20:49:43 swift Exp $
+
+*setools-3.3.7-r6 (23 Nov 2012)
+
+  23 Nov 2012; Sven Vermeulen +setools-3.3.7-r6.ebuild:
+  Fix bugs #436338 and #430262
 
   18 Nov 2012; <swift@gentoo.org> setools-3.3.7-r5.ebuild:
   Adding epatch_user to simplify development and support user-provided patches
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index f38fde267c3f..652b5b824282 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -6,16 +6,18 @@ AUX fix-implicit-def-fstat.patch 441 SHA256 3d0c55580056353ab3ca575899fb8f669d0b
 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-06-gentoo-patches.tar.gz 6081 SHA256 466241e8c59eb78d7ecbbbbaada4d9e9cf1980a5800b2e4628fd33d22908eb2f SHA512 70ba539d26b09fc1470739281d73cc0cf8ea37e83a77ee5f37abd59f1b398d31f10def8fde90083aefdd32c804813b4e7b130454aa89a234722004d90d2562dd WHIRLPOOL dd3d8f7857601485bcb4ce13957fc8ae1f595b230a4354f1cf8d0468dc528783a6974d13e93ce575b08f4e8337e12f6c7e4916ddc6c8c25b719d92d95ce2f175
 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
 EBUILD setools-3.3.7-r5.ebuild 4923 SHA256 1963b571107e60dfa9d2b94c1c6dc1c5478a81c6202600a7df91f33db0e9e451 SHA512 66dfbd2f398edb9bb4684edfaa5be27e7d5261bcd1a062f44e533daac0cfd0d84f0fd56b9840b73b8ca9b88bbe03c1bbeb83c83f1053549c4a268adcab2e5818 WHIRLPOOL 54e3f0e80d2ba6ef8349bb3e7b5cdc94b92c84e2b93f1eb5bb6302d86948a08d6bf3e5755700cae90d03fb000204bb4200a25e274077e57bcfc89089a563635d
-MISC ChangeLog 10868 SHA256 ef46efcf7451e3182cc977bc38489a85504e555792200ced3739580e647ecbd4 SHA512 8a331e7eb433ddd276099de2b10e2fc61779f30b3f0466fb3d6723ca299e690797af198953ff6a78dd6abdbc903b82ab5b4d90f95adfd818461c5f8f44a43412 WHIRLPOOL 064ffb2a2f154eace686a150cdf06357456f645512df61d5b5b8dfebd4e3c974530507f76b8bc3cc39ef94be0b27cfaec84f58f2b5c3099f443f225e8ffc883d
+EBUILD setools-3.3.7-r6.ebuild 4921 SHA256 05cfbaf5c1896f90911a65987e8ecd3dd6c1621feb8e3c231bb94d3db6eb9ec8 SHA512 3185ac8198271e5c92f3444b4f795fec3e5a76e7f6e7ad378c9b402f615e511d7f8d2d452977b41675777bdcf7ce5a73dfe2dbfbcde76fca477e841b44024fce WHIRLPOOL 648b490275d579fb3a3426cf23f808c899da584fb1e928d2679e58e3c8d85eb94b188eea9e785fa59662dbfebdf7df9f8f7c1756955683f5b6a94e2d1ee79aa2
+MISC ChangeLog 10989 SHA256 44f8c3c5b7b405e1ffaf182e8ee0b53383f6eb0c5d76fa8d3eca5a5627ee83ef SHA512 90aeb4c3a004408fe42b5dfe1f9dacac6a168b09a481afadf6fc66add53f8f55540a83eec3a6ae96788f7ed8a2bd2cf8afd08aa8281b17f9145432a0cfacdcc1 WHIRLPOOL 6a1d6c93d8f09bd4cef668492a98c04ca1078fe89dda7443b48484422796f60ea903924c5849cb8771177305f5a9d79e3964b9b1d5d463e49659402c7248c247
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCooS4ACgkQXfqz7M26L9vgggCggafJVbnKUHzB2Dz972RBM9yq
-lpMAn3VH3lg7dozYPttZhcG9YatWM4UR
-=3DPT
+iEYEAREIAAYFAlCv4VgACgkQXfqz7M26L9uxdgCcD+e+2FP0rbAFQ/OrbIVgfM6v
+fjMAoJRC2ocfY/XauoVviTv7NpAjxdh3
+=tP7N
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/setools-3.3.7-r6.ebuild b/app-admin/setools/setools-3.3.7-r6.ebuild
new file mode 100644
index 000000000000..e9df6f06fba6
--- /dev/null
+++ b/app-admin/setools/setools-3.3.7-r6.ebuild
@@ -0,0 +1,175 @@
+# 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-r6.ebuild,v 1.1 2012/11/23 20:49:43 swift Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+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}-06-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
+		>=virtual/jdk-1.4
+	)
+	python? ( <dev-lang/swig-2.0 )
+	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
+
+	epatch_user
+}
+
+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
+}