Fix pthread_cond_timedwait failure. Thx to PeBenito for the patch.

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

3 files changed, 202 insertions, 7 deletions

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 5420f5c870c7..0eebefe4a016 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/setools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.86 2013/06/27 17:05:33 swift Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.87 2014/01/19 20:36:55 swift Exp $
+
+*setools-3.3.8-r3 (19 Jan 2014)
+
+  19 Jan 2014; Sven Vermeulen <swift@gentoo.org> +setools-3.3.8-r3.ebuild:
+  Fix pthread_cond_timedwait error thanks to Christopher J. PeBenito for the
+  patch
 
   27 Jun 2013; Sven Vermeulen <swift@gentoo.org> setools-3.3.8-r2.ebuild:
   Stabilize
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 554866a37028..52f822686282 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -10,6 +10,7 @@ DIST setools-3.3.7-06-gentoo-patches.tar.gz 6081 SHA256 466241e8c59eb78d7ecbbbba
 DIST setools-3.3.7.tar.bz2 940657 SHA256 2bfa0918746bdcc910b16b26a51109a4ffd07404c306141ada584cb36e3c895a SHA512 ae45a8ae11a3b7952da61b6b4c51adbb6b1b7caa6b15fdbfa71f6f150b6bc55d2d918e9e7720f868b4f432a5df6ed35d63d53a1c7640f015d9fa9c415d6e6a21 WHIRLPOOL a524e948c804a268c5308c1b544552b295e954d98a6fbb606bce2bd3cf33d37ebd3a0805226396c70f03d895a9ab8403d9ceeef4dd0117097851bb2ebb7660a1
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 DIST setools-3.3.8-01-gentoo-patches.tar.gz 5798 SHA256 3b8fa933617e42f1fe857b2b8b9ae949ea01324f98f17837e988714562b076b8 SHA512 bcca3678b3f3a3abdbac2d05b1007329249e0dda4f84a9c40c3030cdf22f7815a47bcfa68d7c70836ec1b8b2cbfd8c370d7cd7d09c41b3d4983ec23d79468e56 WHIRLPOOL 5a6072e512754caf7af32a626b3213d6a543c51cc0ff67bbd9b3f6bb822a0b8e406f7e245c9d459be27e2d6ecef527633b889aface5bffc2e04cc15f881529bb
+DIST setools-3.3.8-02-gentoo-patches.tar.gz 6296 SHA256 d386e82ebc0070548a401756985854b79674d7b144076b28f4eaf37fccc0fa1a SHA512 d86ff65f23e54a659eeb2e91d71075e8667d972adcc698709c64f33a9702bb196ef0ded4b5d415f8e5b6a552bfddaaf52b42aa71fb21299f29ca2b7ae230adf1 WHIRLPOOL cd50fbd2f7732f447c224000cd2ebf30c17728217f2e0529d297a110e2ea016498b9bce3dc5209ab8e2cd5091e70e55fb85296bb818567ebe781df74d9aaddf5
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371
 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
@@ -17,12 +18,23 @@ EBUILD setools-3.3.7-r5.ebuild 4923 SHA256 1963b571107e60dfa9d2b94c1c6dc1c5478a8
 EBUILD setools-3.3.7-r6.ebuild 4919 SHA256 79098d92ce9a5f7233cd0e7faf90d77f682bcda62ba2b394a25321a5c13b7e84 SHA512 62b803f82a2a3ecc2b3a36e3329a3ac9a5293fdcfea2c9fdbb9d5a247f76069ef78245b35228936f63838345cd1ddb8d59ae260e9668ac918911599a63a05e01 WHIRLPOOL a6868ec811867d829322663ba275d9506fd64812a0ac78db2f0290a40a4aafd436990b8013efa85827da10ca2b1c992ac386bd22d4a0c1298857c8bc64711d30
 EBUILD setools-3.3.8-r1.ebuild 4919 SHA256 42afa1ed05ee5af6f7b85641852cb3c79849a24a7794dd2080d6ea754fa6c542 SHA512 0d6b9f3d05a75867bc1ac81af52598c6d267277089631a29a7d4383e0139a6e93c09d8d1edc9288a79ca26858df4a9187ea6de56cbd07948b7d7c4b32bc5f4bc WHIRLPOOL 6dd1796d627169b45b4f3492c692c4c352f3c9b9d23163ab696a6b7fdb8c0a2e31e78a9de686e59f6c238c33b1f49e152b8245633eede787501daa8a67accbf9
 EBUILD setools-3.3.8-r2.ebuild 5087 SHA256 5101bfbfd6c76be0f8e984d0e3075da77e8fe1af167e636b9c206038029e98a2 SHA512 146ac0b7e3e9ebf3dfb29446f890f9104a805fdb7aa47061fbe46037303570428830b14ce030be979dd5e4637bb1a01a3324ca0cd7426db09dce768fbe3d3601 WHIRLPOOL e0b8bc0a9e69eb75d974e388d7fff8e13ebe10b7072933edb13d018bbff4af46a24946fc0caf6fe43288ada36861ff4ba9a5764f5c39d826bf9614f264905b19
-MISC ChangeLog 11519 SHA256 83ce3904903eefa3ac0f2d30bfbdb1886c03855dcc7b25409342077aa5b5924f SHA512 d189a42968f7d030b42c9f33c69068db3c4691b9037ea11c31b653c0a5923f4afc4488b263c69f38b4342d64e8ae3b0bf8b40763084b967c413495156e51eacb WHIRLPOOL b93a8af1b0f153c003510551e41f411d73cc0e8cd8954953c4c41b8dd1fd23b566bb8b01d7357d0854b8981a3b8fe188d2b98cdd9ceefadbab3f1523c1197cc6
+EBUILD setools-3.3.8-r3.ebuild 5089 SHA256 106a859da7a115f59f9e68ea77f760207173ead27351f104b17e351974400e21 SHA512 a3565e8296f3fcebd4a600a6a53f648a7a6eecc35d6ba8c8c69681cb0f1445cb22ddc7ce043e39965ae7db0a8d8f8e66a8f037906f7bf6554baff68092827331 WHIRLPOOL d1556dee1f7284dc0cf7312291515d1976ee6f1867e517c57f59d60afbc84b75482ff3dc938b4befa31f1a72e459e8374dfe6dae0fc5d848e44570080a37fa35
+MISC ChangeLog 11713 SHA256 bc54809780edaf9a7b7f92747d6d923ca16051cb5367e0ed5d21948f1c84395f SHA512 9a430c10a4079f72eb837dfd25fe20386a946e3172dff0f6b770638bcf117f7c2f7cc5a5bb79c4b8b7f411ab40ba4bcfd1a8282707c59ea91432f1bfd6d1b356 WHIRLPOOL ef73087442e9a58d7f261e113fabb45c12b6e5930efc1292bf64cd3fbf9a62ecfc18b4e7e2223d8afabd93f887292bbc38522d93a9dbc3cdcff4c09753220a0c
 MISC metadata.xml 228 SHA256 bbcb1daec06953b214112a968d7691679891d41b620789200450e8fabf533951 SHA512 23a02e7ab38822642d81150177d3ce4d24f8aef3e422ba71bc8a9a04e777a2d462f45f4de839fcf39d32207fe60799b890157f90b1aedf5c4369656dc6303851 WHIRLPOOL 7e866656536cb45b9efd876bda1455a6554c5019647ff7d600fe0efb905d4e6102ee1d3041943f411505628e9c0d8d5e14d784589538d93a5d68064c526a2aac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHMcIQACgkQXfqz7M26L9ur4wCfcjEa1rHlLGeOztFi23fXFQBR
-whUAn127e7TT45ziKP+nDclyM1OjP2V9
-=VeSP
+iQIcBAEBCAAGBQJS3DdSAAoJEC7dUkA7aK9Hg68P/3BJHs/AhuFn0UU5Wk/FPpCw
+14zimaEQYkAoo3egOlp2DHAQnB6tbGPDgR/KMmx8fdLmF02GDg0aDzqRC5s0Rk4Y
+WLHuL4UFEW9PyNNZoi3nU1Z4qZXUBLPZXJFNZaO7u99JaFyL7gN3omB8LQXx/nvw
+QIYr2SuEzWmVp+jcckAIzDq3BWWqp/QYDLx2ZDKX9OiRYc1a8ky3K7iCsnv7E8d4
+Sy4r5ZuXcZX6vLXLntT4MXKFgocuY+wy83ZI7aPuULuXHHLOEcedeSDqZ966G6py
+/0hJ72oo5t+blD5Hg4GxjaaCi4JPaOwFiHStdc6gL4L6xibKTzBEaic2SyxUQvN/
+Dus8kyDmTraQoY0sSSlvS+CUYU3ywskqR5QmdwbjlJsVLBvCGtqGfgHDykfib8Z+
++XWv+xJ5MGtKSLOuKmFgWGanqkeM2/SDDZFWmoFMfMgLK96oGgqnDR7XaZ7YBBNj
+a6s3q47i1auvnOOBE72PJscJD7ZJ0nsKr/bxqwVSJ6E9b6gMPswPIFL4T3R3lEPP
+HjgKxjSp+iUWMIraxjykTjtoNiS6Oa0GR+XbxGtqq3znlQCthL1TLpG0sxJ5S2zN
+r7bJgucOzBCUxZLQqzt7QKml7mA5Qv2Wgmt+dutXAwII22p82GO9+RRFpjKfeH+8
+Vug1BzmuRhH3Qyl3szW/
+=4evj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/setools/setools-3.3.8-r3.ebuild b/app-admin/setools/setools-3.3.8-r3.ebuild
new file mode 100644
index 000000000000..c03d2a435a8c
--- /dev/null
+++ b/app-admin/setools/setools-3.3.8-r3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r3.ebuild,v 1.1 2014/01/19 20:36:55 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}-02-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:1
+		>=virtual/jdk-1.4
+	)
+	python? ( dev-lang/swig:1 )
+	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"
+	# Use swig1.3
+	sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
+	# 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() {
+	emake || die "Failed to build setools"
+
+	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
+}