[gentoo-commits] repo/proj/prefix:master commit in: app-misc/pax-utils/

[Fabian Groffen]

commit:     43ccb98745d6eb73e08b0de1a9937f2a191c406c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 12:00:45 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon May 30 12:00:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=43ccb987

app-misc/pax-utils: sync, not tested

Package-Manager: portage-2.2.28

 app-misc/pax-utils/Manifest               |  3 +-
 app-misc/pax-utils/metadata.xml           |  8 ++---
 app-misc/pax-utils/pax-utils-0.2.1.ebuild | 39 ---------------------
 app-misc/pax-utils/pax-utils-0.7.ebuild   | 50 --------------------------
 app-misc/pax-utils/pax-utils-1.1.6.ebuild | 58 +++++++++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 97 deletions(-)

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 91d2dfb..a348da4 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +1,2 @@
-DIST pax-utils-0.2.1.tar.bz2 80580 SHA256 6a5beefb686e425eb6829bc716d2b32b64c2e854287c212c9853bc2beb705c3a SHA512 a8c18a4538227e0a9d34d9e6e6f4c99f50de376b876032092175a7a277d8f5982495ebb28542fddc7361b649e30528a775817749be0c13bd24244bf3c80a57dc WHIRLPOOL 4a77d3ea435a9905a93f0bfc2f1ee33fc709ef7d71e48c44b1b33277ccbd34d586f404c3f7004450612a68f7d4b9810d1cb98c1f255e9d8e0e87fa6fe157eccc
-DIST pax-utils-0.7.tar.xz 90188 SHA256 1ac4cee9a9ca97a723505eb29a25e50adeccffba3f0f0ef4f035cf082caf3b84 SHA512 d99f325b1d3ffc4955bc09aedcbeabea2d87a9647da31db1518de9daa55fbe0e5dd09feedd8dbcd8c4b53825a788ae7c9b904a927abc9ae995385dfd00d44f4a WHIRLPOOL dac9bb6c4e9bbf2b374371009ec16e9bf0e7a69e33494511f99e1cf2c34f684638fa8069a9f3845b8b91edea2927f18f410b9c6e62718c376b96c11d92c84634
 DIST pax-utils-0.8.1.tar.xz 94772 SHA256 844ff25b1a11bcef92ef34b22f576f226a772b67196818656f8874513438f5b9 SHA512 bd8ae0c35058b79a99bcbb5df234c8d4a02ccf0ebd4b06cc30cdb01bc50b7e5ba6cc5cbbf820a0d57dcdc751fd1ea81d5969a4447c4594ab170958edabe41740 WHIRLPOOL 3932cd20479ecbe3d99a6d6e5ce1fd5a5a9d9c96986eccb6cd282457a83d165f1964cfdc232c53cedc1c0dbc391b992129fd1610919cf98f0177e037fa7eed06
+DIST pax-utils-1.1.6.tar.xz 647308 SHA256 f5436c517bea40f7035ec29a6f34034c739b943f2e3a080d76df5dfd7fd41b12 SHA512 c5bdb3ee076c5f4d026f811a59329014c539e3bb3ab45aec92564dcc4abcedaebc50bec55c37aeccfe9e31c554ec7789426fcb3d6f67a8d805843f32c5993f94 WHIRLPOOL 6addfc63dd821a3a0f1ebb2f0545bf81b933bed7aa4950efc51c4af3c8a9dd2263fe09c469bb371a5cb7ae239db646876548a2c21b08c1ed87dd974228eb2679

diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index 448899f..73cd9ce 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>solar@g.o</email>
-    <description>Maintainer</description>
-  </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>vapier@g.o</email>
     <description>Maintainer</description>
   </maintainer>
   <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
   <use>
-    <flag name='python'>Install a more powerful/faster version of lddtree</flag>
+    <flag name="python">Install a more powerful/faster version of lddtree</flag>
   </use>
 </pkgmetadata>

diff --git a/app-misc/pax-utils/pax-utils-0.2.1.ebuild b/app-misc/pax-utils/pax-utils-0.2.1.ebuild
deleted file mode 100644
index 59b3515..0000000
--- a/app-misc/pax-utils/pax-utils-0.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.1.ebuild,v 1.8 2012/02/07 16:58:10 vapier Exp $
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
-HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml"
-SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2
-	http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.bz2"
-#SRC_URI="http://wh0rd.org/pax-utils-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x64-freebsd ~x86-freebsd ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps"
-#RESTRICT="mirror"
-
-DEPEND="caps? ( sys-libs/libcap )
-	ia64-hpux? ( dev-libs/gnulib )
-"
-
-src_compile() {
-	local libs
-	if [[ ${CHOST} == *-hpux* ]]; then
-		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
-		libs="-lgnu"
-	fi
-	# we use C99 features but don't adhere to C99 specs, so ...
-	append-flags -std=gnu99
-	emake CC="$(tc-getCC)" LIBS="${libs}" USE_CAP=$(use caps && echo yes) || die
-}
-
-src_install() {
-	emake CC="$(tc-getCC)" DESTDIR="${D}${EPREFIX}" install || die
-	dodoc BUGS README TODO
-}

diff --git a/app-misc/pax-utils/pax-utils-0.7.ebuild b/app-misc/pax-utils/pax-utils-0.7.ebuild
deleted file mode 100644
index 9b51c7e..0000000
--- a/app-misc/pax-utils/pax-utils-0.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.7.ebuild,v 1.10 2014/01/18 03:18:03 vapier Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs unpacker flag-o-matic
-
-DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
-HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml"
-SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz
-	http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz
-	http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x64-freebsd ~x86-freebsd ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps python"
-#RESTRICT="mirror"
-
-RDEPEND="caps? ( sys-libs/libcap )
-	python? ( dev-python/pyelftools )
-	ia64-hpux? ( dev-libs/gnulib )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_PYTHON=$(usex python) \
-		"$@"
-}
-
-src_compile() {
-	local libs
-	if [[ ${CHOST} == *-hpux* ]]; then
-		append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
-		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
-		libs="-lgnu"
-	fi
-	_emake CC="$(tc-getCC)" LIBS="${libs}"
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake CC="$(tc-getCC)" DESTDIR="${D}${EPREFIX}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}

diff --git a/app-misc/pax-utils/pax-utils-1.1.6.ebuild b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
new file mode 100644
index 0000000..0abd62f
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~solar/pax/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x64-freebsd ~x86-freebsd ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? ( dev-python/pyelftools )
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+}