From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA3071381F3 for ; Sun, 18 Nov 2012 13:17:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72E3421C083; Sun, 18 Nov 2012 13:17:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDB6C21C083 for ; Sun, 18 Nov 2012 13:17:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BBFD33D847 for ; Sun, 18 Nov 2012 13:17:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B0AD5E5436 for ; Sun, 18 Nov 2012 13:17:38 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1353244609.dd384b3e8fd7df42677573cf2bc02798be1a4b60.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-dev:master commit in: app-admin/setools/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: app-admin/setools/ChangeLog app-admin/setools/metadata.xml app-admin/setools/setools-3.3.7-r6.ebuild X-VCS-Directories: app-admin/setools/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: dd384b3e8fd7df42677573cf2bc02798be1a4b60 X-VCS-Branch: master Date: Sun, 18 Nov 2012 13:17:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 81f18c54-920b-4ae0-84d9-6bd74e26b24e X-Archives-Hash: 857c241cafa07c054d578f2efd6af8bd commit: dd384b3e8fd7df42677573cf2bc02798be1a4b60 Author: Sven Vermeulen siphos be> AuthorDate: Sun Nov 18 13:16:49 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Sun Nov 18 13:16:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=dd384b3e Use python-2.7 and swig-1.something, fixes #430262 (Portage version: 2.1.11.9/git/Linux x86_64, signed Manifest commit with key 0xCDBA2FDB) --- app-admin/setools/ChangeLog | 12 ++ app-admin/setools/metadata.xml | 6 + app-admin/setools/setools-3.3.7-r6.ebuild | 175 +++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 0 deletions(-) diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog new file mode 100644 index 0000000..21186e9 --- /dev/null +++ b/app-admin/setools/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for app-admin/setools +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 18 Nov 2012; +setools-3.3.7-r6.ebuild, +metadata.xml: + Fix bug #430262 + +*setools-3.3.7-r6 (18 Nov 2012) + + 18 Nov 2012; +setools-3.3.7-r6.ebuild, +metadata.xml: + Trying removal of swig-changes and use different method for fixing + 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 @@ + + + + selinux + SELinux policy analysis tools. + 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 0000000..841a3be --- /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-r5.ebuild,v 1.2 2012/11/18 08:49:57 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? ( + =virtual/jdk-1.4 + ) + python? ( =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 +}