perfinion 15/02/12 18:04:48 Modified: ChangeLog Added: setools-3.3.8-r6.ebuild Log: fix compile error with 2.4 userland, bug 539462 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)
Revision Changes Path 1.94 app-admin/setools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.94&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?rev=1.94&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/ChangeLog?r1=1.93&r2=1.94 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- ChangeLog 5 Aug 2014 10:06:33 -0000 1.93 +++ ChangeLog 12 Feb 2015 18:04:48 -0000 1.94 @@ -1,6 +1,12 @@ # ChangeLog for app-admin/setools -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.93 2014/08/05 10:06:33 swift Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.94 2015/02/12 18:04:48 perfinion Exp $ + +*setools-3.3.8-r6 (12 Feb 2015) + + 12 Feb 2015; Jason Zaman <perfin...@gentoo.org> + +files/setools3-userspace-2.4-compatibility.patch, +setools-3.3.8-r6.ebuild: + fix compile error with 2.4 userland, bug 539462 05 Aug 2014; Sven Vermeulen <sw...@gentoo.org> -setools-3.3.8-r2.ebuild, -setools-3.3.8-r4.ebuild: 1.1 app-admin/setools/setools-3.3.8-r6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r6.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/setools/setools-3.3.8-r6.ebuild?rev=1.1&content-type=text/plain Index: setools-3.3.8-r6.ebuild =================================================================== # Copyright 1999-2015 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-r6.ebuild,v 1.1 2015/02/12 18:04:48 perfinion Exp $ EAPI="5" PYTHON_COMPAT=( python2_7 ) inherit autotools java-pkg-opt-2 python-r1 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}-03-gentoo-patches.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X debug java python" DEPEND=">=sys-devel/automake-1.12.1 >=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 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? ( ${PYTHON_DEPS} 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-2.3 >=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" # setools dirs that contain python code to build PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python" pkg_setup() { local myld=$(tc-getLD) if use java; then java-pkg-opt-2_pkg_setup fi ${myld} -v | grep -q "GNU gold" && \ ewarn "Bug #467136 shows us that the gold linker doesn't work with setools for now." } src_prepare() { epatch "${FILESDIR}/setools3-userspace-2.4-compatibility.patch" 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_EXCLUDE="0010-fix-lsetfilecon_raw-call-bug-509532.patch 0005-update-on-py_functions-for-python3.patch" \ 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 # bug #424581, Need to use MKDIR_P for automake 1.12+. 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 LD="$(tc-getLD).bfd" || die "Failed to build setools" if use python; then building() { python_export PYTHON_INCLUDEDIR python_export PYTHON_SITEDIR python_export PYTHON_LIBS emake LD="$(tc-getLD).bfd" \ SWIG_PYTHON_CPPFLAGS="-I${PYTHON_INCLUDEDIR}" \ PYTHON_LDFLAGS="${PYTHON_LIBS}" \ pyexecdir="${PYTHON_SITEDIR}" \ pythondir="${PYTHON_SITEDIR}" \ -C ${1}; } local dir for dir in ${PYTHON_DIRS}; do python_foreach_impl building ${dir}; done fi } src_install() { emake DESTDIR="${D}" install || die "emake install failed" if use python; then installation() { python_export PYTHON_SITEDIR emake DESTDIR="${D}" \ pyexecdir="${PYTHON_SITEDIR}" \ pythondir="${PYTHON_SITEDIR}" \ -C ${1} install } local dir for dir in ${PYTHON_DIRS}; do python_foreach_impl installation ${dir}; done fi }
