[gentoo-commits] proj/hardened-dev:master commit in: app-admin/setools/

[Sven Vermeulen]

commit:     e102534a3b1f0da1bcd458fb9673f54dfe4d17fb
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Fri Aug 24 17:05:26 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Fri Aug 24 17:05:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=e102534a

Fixing bugs #430262 and #424627

---
 app-admin/setools/ChangeLog               |  339 +++++++++++++++++++++++++++++
 app-admin/setools/metadata.xml            |    6 +
 app-admin/setools/setools-3.3.7-r5.ebuild |  173 +++++++++++++++
 3 files changed, 518 insertions(+), 0 deletions(-)

diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
new file mode 100644
index 0000000..87aea46
--- /dev/null
+++ b/app-admin/setools/ChangeLog
@@ -0,0 +1,339 @@
+# 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 $
+
+*setools-3.3.7-r5 (24 Aug 2012)
+
+  24 Aug 2012; <swift@g.o> +setools-3.3.7-r5.ebuild, +metadata.xml:
+  Fixing bugs #430262 and #424627
+
+  30 Jul 2012; <swift@g.o> setools-3.3.7-r3.ebuild:
+  Stabilization
+
+  09 Jul 2012; <swift@g.o> setools-3.3.7-r3.ebuild:
+  Fixing bug #424581 - Work around mkdir_p changes in automake until 1.12 is
+  default
+
+  26 Jun 2012; Mike Gilbert <floppym@g.o> setools-3.3.7-r1.ebuild,
+  setools-3.3.7-r3.ebuild:
+  Restict pypy per Arfrever.
+
+*setools-3.3.7-r3 (25 Jun 2012)
+
+  25 Jun 2012; <swift@g.o> +setools-3.3.7-r3.ebuild:
+  Support Python3, fix audit2allow support, bug #415091 and bug #408179
+
+  21 May 2012; Mike Frysinger <vapier@g.o> setools-3.3.7-r1.ebuild:
+  Inherit eutils for epatch.
+
+  03 May 2012; Jeff Horelick <jdhore@g.o> setools-3.3.7-r1.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  12 Nov 2011; <swift@g.o> -setools-3.3.7.ebuild:
+  Remove obsoleted ebuilds
+
+  23 Oct 2011; <swift@g.o> setools-3.3.7-r1.ebuild:
+  Stabilization (tracker #384231)
+
+  19 Aug 2011; <swift@g.o> -setools-2.4.ebuild, -setools-3.3.4.ebuild,
+  -setools-3.3.5.ebuild, -setools-3.3.6.ebuild,
+  -files/setools-3.3.6-headers.diff, -files/apol_tcl_fc.c.diff:
+  Remove obsoleted versions of setools
+
+*setools-3.3.7-r1 (19 Aug 2011)
+
+  19 Aug 2011; <swift@g.o>
+  +files/fix-check-role_set_expand-libsepol-2.1.0.patch,
+  +setools-3.3.7-r1.ebuild, +files/fix-implicit-def-fstat.patch:
+  Fix #378943 where setools fails to build with new selinux userspace
+
+  08 Jul 2011; Samuli Suominen <ssuominen@g.o> setools-2.4.ebuild:
+  Convert from "useq" to "use".
+
+  28 May 2011; Anthony G. Basile <blueness@g.o> setools-3.3.7.ebuild:
+  Stable amd64 x86
+
+  04 Apr 2011; Anthony G. Basile <blueness@g.o> setools-2.4.ebuild:
+  Updated SRC_URI, bug #341929
+
+  29 Mar 2011; Christoph Mende <angelos@g.o> setools-3.3.4.ebuild,
+  setools-3.3.5.ebuild, setools-3.3.6.ebuild, setools-3.3.7.ebuild:
+  Fixed slot deps
+
+  13 Feb 2011; Anthony G. Basile <blueness@g.o> metadata.xml:
+  Updated metadata.xml to reflect new selinux herd.
+
+  06 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  setools-3.3.7.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #308279). Fix building with SWIG 2.
+
+*setools-3.3.7 (12 May 2010)
+
+  12 May 2010; Chris PeBenito <pebenito@g.o> +setools-3.3.7.ebuild:
+  New upstream release.
+
+  20 Sep 2009; Chris PeBenito <pebenito@g.o> setools-3.3.6.ebuild,
+  +files/setools-3.3.6-headers.diff:
+  Fix QA issues.
+
+*setools-3.3.6 (08 Aug 2009)
+
+  08 Aug 2009; Chris PeBenito <pebenito@g.o> +setools-3.3.6.ebuild:
+  New upstream release.
+
+  22 Jul 2009; Chris PeBenito <pebenito@g.o> setools-3.3.4.ebuild,
+  setools-3.3.5.ebuild:
+  Drop alpha, mips, ppc, sparc selinux support.
+
+  13 Jul 2009; Diego E. Pettenò <flameeyes@g.o>
+  setools-3.3.5.ebuild:
+  Use emake rather than make.
+
+*setools-3.3.5 (02 Dec 2008)
+
+  02 Dec 2008; Chris PeBenito <pebenito@g.o> setools-2.4.ebuild,
+  -setools-3.3.1.ebuild, -setools-3.3.3.ebuild, +setools-3.3.5.ebuild:
+  New upstream bugfix release for libsepol 2.x additional features.
+  Cleanup old ebuilds.
+
+*setools-3.3.4 (31 Mar 2008)
+
+  31 Mar 2008; Chris PeBenito <pebenito@g.o> +setools-3.3.4.ebuild:
+  Update with fixes for glibc 2.7, gcc 3.4, and tcl/tk 8.5.
+
+*setools-3.3.3 (26 Feb 2008)
+
+  26 Feb 2008; Chris PeBenito <pebenito@g.o> +setools-3.3.3.ebuild:
+  New upstream bugfix release.
+
+*setools-3.3.1 (27 Aug 2007)
+
+  27 Aug 2007; Chris PeBenito <pebenito@g.o> -setools-3.0.ebuild,
+  -setools-3.1.ebuild, -setools-3.2.ebuild, -setools-3.3.ebuild,
+  +setools-3.3.1.ebuild:
+  New upstream bugfix release.  Clear out old unstable ebuilds.
+
+  20 Aug 2007; Chris PeBenito <pebenito@g.o> setools-3.1.ebuild,
+  setools-3.2.ebuild:
+  Set bwidget dep to 1.8 to fix #175415.
+
+*setools-3.3 (04 Aug 2007)
+
+  04 Aug 2007; Chris PeBenito <pebenito@g.o> +setools-3.3.ebuild:
+  New upstream release.
+
+*setools-3.2 (09 May 2007)
+
+  09 May 2007; Chris PeBenito <pebenito@g.o> +setools-3.2.ebuild:
+  New upstream release.
+
+*setools-3.1 (16 Feb 2007)
+
+  16 Feb 2007; Chris PeBenito <pebenito@g.o> +setools-3.1.ebuild:
+  New upstream release.
+
+  02 Feb 2007; Chris PeBenito <pebenito@g.o> setools-3.0.ebuild:
+  Fix bug #156752.
+
+*setools-3.0 (18 Oct 2006)
+
+  18 Oct 2006; Chris PeBenito <pebenito@g.o>
+  -files/setools-2.2-nogui.diff, -setools-2.2.ebuild, -setools-2.3.ebuild,
+  +setools-3.0.ebuild:
+  New upstream release.
+
+  12 Sep 2006; Chris PeBenito <pebenito@g.o> setools-2.4.ebuild:
+  Mark stable.
+
+  11 Sep 2006; Chris PeBenito <pebenito@g.o>
+  +files/apol_tcl_fc.c.diff, setools-2.4.ebuild:
+  Fixes to hopefully take care of #133028
+
+*setools-2.4 (09 May 2006)
+
+  09 May 2006; Chris PeBenito <pebenito@g.o> +setools-2.4.ebuild:
+  New upstream release.
+
+*setools-2.3 (03 Feb 2006)
+
+  03 Feb 2006; Chris PeBenito <pebenito@g.o> +setools-2.3.ebuild:
+  New upstream release.
+
+  02 Jan 2006; Chris PeBenito <pebenito@g.o> -setools-2.1.2.ebuild,
+  -setools-2.1.3.ebuild, setools-2.2.ebuild:
+  Mark stable.
+
+  05 Dec 2005; Chris PeBenito <pebenito@g.o> metadata.xml,
+  setools-2.1.2.ebuild, setools-2.1.3.ebuild, setools-2.2.ebuild:
+  Update homepage and metadata.
+
+  12 Nov 2005; Chris PeBenito <pebenito@g.o>
+  +files/setools-2.2-nogui.diff, setools-2.2.ebuild:
+  Add patch to fix bug #112284.
+
+*setools-2.2 (08 Nov 2005)
+
+  08 Nov 2005; Chris PeBenito <pebenito@g.o> +setools-2.2.ebuild:
+  New upstream release.
+
+*setools-2.1.3 (12 Oct 2005)
+
+  12 Oct 2005; Chris PeBenito <pebenito@g.o> -setools-2.1.0.ebuild,
+  -setools-2.1.1.ebuild, +setools-2.1.3.ebuild:
+  New upstream release.
+
+  08 Oct 2005; Chris PeBenito <pebenito@g.o> setools-2.1.2.ebuild:
+  Mark stable.
+
+  07 Sep 2005; Chris PeBenito <pebenito@g.o> setools-2.1.0.ebuild,
+  setools-2.1.1.ebuild, setools-2.1.2.ebuild:
+  Fix changed URIs.
+
+*setools-2.1.2 (07 Sep 2005)
+
+  07 Sep 2005; Chris PeBenito <pebenito@g.o> +setools-2.1.2.ebuild:
+  New upstream release.
+
+*setools-2.1.1 (20 May 2005)
+
+  20 May 2005; Chris PeBenito <pebenito@g.o> setools-2.1.0.ebuild,
+  +setools-2.1.1.ebuild:
+  Mark 2.1.0 stable, plus new upstream release.
+
+  21 Apr 2005; Simon Stelling <blubb@g.o> setools-2.0-r1.ebuild:
+  stable on amd64
+
+*setools-2.1.0 (19 Apr 2005)
+
+  19 Apr 2005; Chris PeBenito <pebenito@g.o> +setools-2.1.0.ebuild:
+  New upstream release.
+
+*setools-2.0-r1 (09 Apr 2005)
+
+  09 Apr 2005; Chris PeBenito <pebenito@g.o> +setools-2.0-r1.ebuild:
+  Fix for bug #88248.
+
+  29 Mar 2005; Chris PeBenito <pebenito@g.o> setools-2.0.ebuild:
+  Mark stable.
+
+  06 Mar 2005; Chris PeBenito <pebenito@g.o> setools-2.0.ebuild:
+  Went overboard on CFLAGS fixes, causing some compile failures on some machines.
+
+  04 Mar 2005; Chris PeBenito <pebenito@g.o> setools-2.0.ebuild:
+  Fix DEPEND
+
+*setools-2.0 (04 Mar 2005)
+
+  04 Mar 2005; Chris PeBenito <pebenito@g.o> setools-1.5.1.ebuild,
+  +setools-2.0.ebuild:
+  New upstream major release.  Mark 1.5.1 stable for x86 and ppc.
+
+*setools-1.5.1 (06 Nov 2004)
+
+  06 Nov 2004; Chris PeBenito <pebenito@g.o> +setools-1.5.1.ebuild:
+  New upstream release
+
+*setools-1.4.1-r1 (15 Sep 2004)
+
+  15 Sep 2004; Chris PeBenito <pebenito@g.o> -setools-1.3.1.ebuild,
+  +setools-1.4.1-r1.ebuild, -setools-1.4.1.ebuild:
+  Fix seuser.fc install.
+
+*setools-1.4.1 (22 Aug 2004)
+
+  22 Aug 2004; Chris PeBenito <pebenito@g.o> +setools-1.4.1.ebuild,
+  -setools-1.4.ebuild:
+  Bugfix release.
+
+  24 Jul 2004; Joshua Brindle <method@g.o> setools-1.4.ebuild:
+  add libselinux dependancy
+
+*setools-1.4 (21 Jun 2004)
+
+  21 Jun 2004; Chris PeBenito <pebenito@g.o> +setools-1.4.ebuild:
+  New upstream version.
+
+  21 Jun 2004; Chris PeBenito <pebenito@g.o> setools-1.3.1.ebuild:
+  Fix for compiles that are USE="-selinux".
+
+  24 May 2004; Chris PeBenito <pebenito@g.o> setools-1.3.1.ebuild:
+  Fix sandbox violations.
+
+*setools-1.3.1 (05 May 2004)
+
+  05 May 2004; Chris PeBenito <pebenito@g.o> +setools-1.3.1.ebuild,
+  -setools-1.3.ebuild:
+  New upstream bugfix release.
+
+  04 May 2004; Chris PeBenito <pebenito@g.o> -setools-1.2.1.ebuild,
+  setools-1.3.ebuild:
+  Mark stable
+
+  29 Apr 2004; Chris PeBenito <pebenito@g.o> setools-1.2.1.ebuild,
+  setools-1.3.ebuild:
+  Add missing libxml2 dep.
+
+*setools-1.3 (15 Apr 2004)
+
+  15 Apr 2004; Chris PeBenito <pebenito@g.o> +setools-1.3.ebuild:
+  New upstream version.
+
+  03 Mar 2004; Chris PeBenito <pebenito@g.o> setools-1.2.1.ebuild:
+  Mark stable.
+
+*setools-1.2.1 (08 Feb 2004)
+
+  08 Feb 2004; Chris PeBenito <pebenito@g.o> setools-1.2.1.ebuild:
+  New upstream bugfix release.
+
+  06 Feb 2004; Chris PeBenito <pebenito@g.o> setools-1.2.ebuild:
+  Fix seuser file contexts and conf file.
+
+*setools-1.2 (05 Feb 2004)
+
+  05 Feb 2004; Chris PeBenito <pebenito@g.o> setools-1.2.ebuild:
+  New upstream version.
+
+  31 Jan 2004; Chris PeBenito <pebenito@g.o> setools-1.1.1.ebuild:
+  Mark stable.
+
+*setools-1.1.1 (06 Jan 2004)
+
+  06 Jan 2004; Chris PeBenito <pebenito@g.o> setools-1.1.1.ebuild:
+  New upstream bugfix release.
+
+  28 Dec 2003; Chris PeBenito <pebenito@g.o> setools-1.1.ebuild:
+  Eliminate install -Z. The context option is not needed, and causes sandbox
+  violations.
+
+  22 Dec 2003; Chris PeBenito <pebenito@g.o> setools-1.1.ebuild,
+  files/setools-1.1-fix_noX.diff:
+  Treesys makefiles are broken. Add a hack to make it really work for non X
+  systems.
+
+*setools-1.1 (22 Dec 2003)
+
+  22 Dec 2003; Chris PeBenito <pebenito@g.o> setools-1.1.ebuild:
+  New upstream version. Now X is optional, as there are command line tools. Also
+  has a new optional gtk log analyzer for audit messages.
+
+  20 Nov 2003; Chris PeBenito <pebenito@g.o> setools-1.0.1.ebuild:
+  Mark stable
+
+*setools-1.0.1 (06 Nov 2003)
+
+  06 Nov 2003; Chris PeBenito <pebenito@g.o> setools-1.0.1.ebuild:
+  New upstream minor version.
+
+*setools-1.0 (23 Oct 2003)
+
+  23 Oct 2003; Chris PeBenito <pebenito@g.o> setools-1.0.ebuild:
+  Setools for the new SELinux API.
+
+  22 Sep 2003; Chris PeBenito <pebenito@g.o> setools-20030609.ebuild:
+  Overdue, mark stable.
+
+*setools-20030609 (02 Jul 2003)
+
+  02 Jul 2003; Chris PeBenito <pebenito@g.o> setools-20030609.ebuild:
+  Initial commit

diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
new file mode 100644
index 0000000..3c35d57
--- /dev/null
+++ b/app-admin/setools/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>SELinux policy analysis tools.</longdescription>
+</pkgmetadata>

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 0000000..69db1fe
--- /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-r3.ebuild,v 1.4 2012/07/30 16:33:57 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
+}