app-misc/pax-utils: version bump to 1.2.2-r2

3 files changed, 245 insertions, 0 deletions

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 194c509d..d2bee2ae 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,8 +1,10 @@
 AUX pax-utils-1.1.7-musl.patch 1801 SHA256 c85ea6e7b0459453e9aa969f8694a6add87096b45e10c4b0d96c1297b5f4e1a4 SHA512 2257c4ce6605696b68733fcb137818051de7ed252a41fb44af23d6856e019d299cb31201ca63136ce8999178e51044bf41f7e3a5311810c1a2a9c65366d412ed WHIRLPOOL c688ae73debc9f10caec5879a0be464d7d6fd7759fd04b1a0d6454618e6241b2b56efdb24015ee99bd9499903973d2b2d6d45e6ff3d27a579324f766ccd2cea0
 AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 SHA256 aeda213844489fc4c08f114f057a3eda7825f3498cdc90b77f72bd4dfd7f1bbb SHA512 b0e0679c726acc56686b23b6d4720cd5b7e4dff3f007e0443e3ec37a434ffb2def2c351c81ef960bf8e1008769662851017ef9aaedc9b52890578db4d313a54e WHIRLPOOL 51b66b55530dbbf9320e352dd3a6b1731f785ce57d9c12237006bbf18e7da19b2dbd52f22744676c2ae1d66ba83197e4d9787f05827b6099a425707ebe8409a3
+AUX pax-utils-1.2.2-solaris.patch 5673 SHA256 dabf253d2399c3b31ebf2ca042a50e650c77ca170f64e170515cbab13e4453ba SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1 WHIRLPOOL b14193d1871b6272f159e88c032a22808f47c6cb248c67b0f7ce6eb90409d53162b15c7df3778757c0c86af54ac8be1e19477f46d93a39fda5338d4289bf611d
 DIST pax-utils-1.1.7.tar.xz 648376 SHA256 bb9bdbf0888de9444b53b78f7b8069af9832bac7cef0588030b8ce49e8ebad10 SHA512 cec176cf5863b15acc058cbd99639f5f456346136d0551ce5875cb66c28dd0f6e7f5077b0c06751a3a68984b5c4386c232d3db8b76aa4f4b326b0b692835fdeb WHIRLPOOL 07972470889ff3f4a85f1528bc6c49ae11c3161dfe0df4ab0c3ea83affdc36d0fce36f4db5a0811290958d51e477da99476a12bf35108c4a3b147004a0584541
 DIST pax-utils-1.2.2.tar.xz 655964 SHA256 7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c WHIRLPOOL c95ce5dc26d7e913d9e0963d47b5cedbc71cb1faf52ca7bb04898b2bcaa9f6c521f2236e2475d41954c93061267f0fcca5053d4dae3cf12bb59fdc986612dfdb
 EBUILD pax-utils-1.1.7.ebuild 1541 SHA256 9a747512bda7b754bbde094de77f2907b01e1c1a886192ea6a9a40bb443937cb SHA512 b2c9fa5616e6494f8e3f2faa79f03ec69d5dadb23154a33d8f2630c855a542ade2bedd9286d4ed7cee789a4665c429736777f313bd6cfd0dc32b9c57ac9fe860 WHIRLPOOL 5bea6b86d8fb35a5061b0d07ffb53b214447428f95547cbad2942d2813447b28bc2440d24f6fafa829a1579fa92b606c3f655d8c7f0751ac722e644590adf4a0
 EBUILD pax-utils-1.2.2-r1.ebuild 1613 SHA256 9ab28cc1afd3830a9cbc709140a881679b5268feb06e40a1c0b5ffb46ebedcd3 SHA512 d3b524a2cb700650f13bc253a261c5e69e9fa028cbc7e73bada65a401d73aacd63d1ceb5777268822815abba493accab4ed19cf47526287dc7de1467343c7625 WHIRLPOOL 4f00bfa4d6b22be62a8baa1bdc973ec6d64f6f5824b0a4b157106696e8b7cc2eb0a7e3bd75e79011403cd8e009147a915ec477badf2b2f584f66c6b0b4a7f93a
+EBUILD pax-utils-1.2.2-r2.ebuild 1647 SHA256 caecb99511dce2670967daa73db644f9d005810e05420df650a0b00acac59543 SHA512 35960f243f8479472dca3b2af5c6f6f28a6dbfca2a39047aa7e3b1802d2a9556627d662d1253b04550354333dde7b00c0a7dec1feb03de3a949cd57007abef4e WHIRLPOOL 0b5e2076359d9e537fbf70a53422e66183397354112f9b50e43755597165aa5a59ae8433cbe3e39036c565d086a64621666f5fc7c009ecf3beeccaf4e98de088
 EBUILD pax-utils-1.2.2.ebuild 1561 SHA256 89e6ba252da96bc386c9713f458a9fc6e88da61deafac27dc432b0ca99de6397 SHA512 fc44b141e59b2e9e282a3662467fe43febb4a2e95872ccb15936372c9fb5c16fe83b2be4077889ba5556c22cf48abddcdb0bfde6d3de524de88d28f293d7e12d WHIRLPOOL 8368b440ec2b122462700c3e4accee703436b55f932dc16ee9ae5f660d2d9541676a8dc7136403d212a4122ad6466d1d9b13d77d958ab634163a1a4ef5722f0d
 MISC metadata.xml 584 SHA256 5aa079a277468814cecc8dd01365e017de646a3786b561c001a7398e7747f047 SHA512 d8458090413d52aaa38b6867edf0a9f996e08b36f9750bfa2469c2aa7d6b0718157feace3dbbb3c63c2795e977ddd6a9c637223192dff90e8ca87facb730bdf4 WHIRLPOOL d745c0db8e85f85c968fea5408a05c6585d54774bc3f953b1debb0ec17b7ce5d942cd1e048026f1a790bc56aa20f3301f973c5e02dd5da24f47d725f6652f5be
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch
new file mode 100644
index 00000000..de1427f9
--- /dev/null
+++ b/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch
@@ -0,0 +1,181 @@
+This is the diff for generated sources after applying:
+https://github.com/gentoo/pax-utils/pull/1
+
+diff -ruN pax-utils-1.2.2.orig/autotools/gnulib/Makefile.in pax-utils-1.2.2/autotools/gnulib/Makefile.in
+--- pax-utils-1.2.2.orig/autotools/gnulib/Makefile.in	2017-01-24 21:30:06.000000000 +0100
++++ pax-utils-1.2.2/autotools/gnulib/Makefile.in	2017-03-15 10:59:05.616490166 +0100
+@@ -1483,7 +1484,7 @@
+ 	$(top_srcdir)/autotools/snippet/c++defs.h \
+ 	$(top_srcdir)/autotools/snippet/warn-on-use.h stat.c \
+ 	stat-time.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \
+-	stdlib.in.h strcasecmp.c strncasecmp.c str-two-way.h \
++	stdlib.in.h stpcpy.c strcasecmp.c strncasecmp.c str-two-way.h \
+ 	strcasestr.c strdup.c strerror.c strerror-override.c \
+ 	strerror-override.h string.in.h strings.in.h strncat.c \
+ 	symlink.c at-func.c symlinkat.c sys_stat.in.h sys_time.in.h \
+@@ -1546,7 +1547,7 @@
+ 	msvc-nothrow.c open.c openat.c opendir.c printf-frexp.c \
+ 	readlink.c at-func.c readlinkat.c realloc.c rename.c \
+ 	at-func2.c renameat.c rmdir.c signbitd.c signbitf.c signbitl.c \
+-	stat.c strcasecmp.c strncasecmp.c strcasestr.c strdup.c \
++	stat.c stpcpy.c strcasecmp.c strncasecmp.c strcasestr.c strdup.c \
+ 	strerror.c strerror-override.c strncat.c symlink.c at-func.c \
+ 	symlinkat.c unlink.c at-func.c unlinkat.c at-func.c \
+ 	utimensat.c asnprintf.c printf-args.c printf-parse.c \
+@@ -1708,6 +1709,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statat.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@
+diff -ruN pax-utils-1.2.2.orig/autotools/gnulib/stpcpy.c pax-utils-1.2.2/autotools/gnulib/stpcpy.c
+--- pax-utils-1.2.2.orig/autotools/gnulib/stpcpy.c	1970-01-01 01:00:00.000000000 +0100
++++ pax-utils-1.2.2/autotools/gnulib/stpcpy.c	2017-03-15 10:59:24.159820259 +0100
+@@ -0,0 +1,49 @@
++/* stpcpy.c -- copy a string and return pointer to end of new string
++   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2017 Free Software
++   Foundation, Inc.
++
++   NOTE: The canonical source of this file is maintained with the GNU C Library.
++   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
++
++   This program is free software: you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by the
++   Free Software Foundation; either version 3 of the License, or any
++   later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <config.h>
++
++#include <string.h>
++
++#undef __stpcpy
++#ifdef _LIBC
++# undef stpcpy
++#endif
++
++#ifndef weak_alias
++# define __stpcpy stpcpy
++#endif
++
++/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
++char *
++__stpcpy (char *dest, const char *src)
++{
++  register char *d = dest;
++  register const char *s = src;
++
++  do
++    *d++ = *s;
++  while (*s++ != '\0');
++
++  return d - 1;
++}
++#ifdef weak_alias
++weak_alias (__stpcpy, stpcpy)
++#endif
+diff -ruN pax-utils-1.2.2.orig/config.h.in pax-utils-1.2.2/config.h.in
+--- pax-utils-1.2.2.orig/config.h.in	2017-01-24 21:30:04.000000000 +0100
++++ pax-utils-1.2.2/config.h.in	2017-03-15 11:01:30.156464381 +0100
+@@ -264,6 +264,9 @@
+ /* Define to 1 when the gnulib module stat should be tested. */
+ #undef GNULIB_TEST_STAT
+ 
++/* Define to 1 when the gnulib module stpcpy should be tested. */
++#undef GNULIB_TEST_STPCPY
++
+ /* Define to 1 when the gnulib module strcasestr should be tested. */
+ #undef GNULIB_TEST_STRCASESTR
+ 
+@@ -1415,6 +1418,9 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #undef HAVE_STDLIB_H
+ 
++/* Define to 1 if you have the `stpcpy' function. */
++#undef HAVE_STPCPY
++
+ /* Define to 1 if you have the `strcasecmp' function. */
+ #undef HAVE_STRCASECMP
+ 
+diff -ruN pax-utils-1.2.2.orig/configure pax-utils-1.2.2/configure
+--- pax-utils-1.2.2.orig/configure	2017-01-24 21:30:03.000000000 +0100
++++ pax-utils-1.2.2/configure	2017-03-15 11:02:09.889790417 +0100
+@@ -31596,6 +31597,57 @@
+ 
+ 
+ 
++
++
++
++
++
++  for ac_func in stpcpy
++do :
++  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
++if test "x$ac_cv_func_stpcpy" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_STPCPY 1
++_ACEOF
++
++fi
++done
++
++  if test $ac_cv_func_stpcpy = no; then
++    HAVE_STPCPY=0
++  fi
++
++  if test $HAVE_STPCPY = 0; then
++
++
++
++
++
++
++
++
++  gl_LIBOBJS="$gl_LIBOBJS stpcpy.$ac_objext"
++
++
++  :
++
++  fi
++
++
++
++
++
++          GNULIB_STPCPY=1
++
++
++
++
++
++$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
++
++
++
++
+ 
+ 
+   for ac_func in strcasecmp
+diff -ruN pax-utils-1.2.2.orig/Makefile.in pax-utils-1.2.2/Makefile.in
+--- pax-utils-1.2.2.orig/Makefile.in	2017-01-24 21:30:06.000000000 +0100
++++ pax-utils-1.2.2/Makefile.in	2017-03-15 11:03:01.856447406 +0100
+@@ -1522,7 +1523,7 @@
+ 	security.c \
+ 	xfuncs.c
+ 
+-LDADD = libpaxutils.la $(top_builddir)/autotools/gnulib/libgnu.a
++LDADD = libpaxutils.la $(top_builddir)/autotools/gnulib/libgnu.a $(LIB_EACCESS)
+ bin_SCRIPTS = lddtree symtree
+ CLEANFILES = $(bin_SCRIPTS)
+ TMAKE = \
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
new file mode 100644
index 00000000..31400b7a
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils 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
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch
+	"${FILESDIR}"/${P}-solaris.patch
+	"${FILESDIR}/${PN}-1.1.7-musl.patch"
+)
+
+_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
+}