commit: 563a8cf4eef8e71e9a8e9cbbaaf72406d04c224d Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Wed Jan 3 17:38:02 2018 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Wed Jan 3 17:38:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=563a8cf4
app-misc/pax-utils: sync with tree .../files/pax-utils-1.2.2-linux-2.6.32.patch | 65 ++++++++++++++++++++++ app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild | 61 -------------------- app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild | 1 + app-misc/pax-utils/pax-utils-1.2.2.ebuild | 60 -------------------- 4 files changed, 66 insertions(+), 121 deletions(-) diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch new file mode 100644 index 0000000..8139310 --- /dev/null +++ b/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch @@ -0,0 +1,65 @@ +This is the diff for generated sources after applying: +https://github.com/gentoo/pax-utils/pull/2 + +diff -ru pax-utils-HEAD.orig/config.h.in pax-utils-HEAD/config.h.in +--- pax-utils-HEAD.orig/config.h.in 2017-04-18 16:26:42.000000000 +0200 ++++ pax-utils-HEAD/config.h.in 2017-04-18 16:28:05.000000000 +0200 +@@ -526,6 +526,9 @@ + /* Define to 1 if you have the `link' function. */ + #undef HAVE_LINK + ++/* Define to 1 if you have the <linux/securebits.h> header file. */ ++#undef HAVE_LINUX_SECUREBITS_H ++ + /* Define to 1 if the system has the type 'long long int'. */ + #undef HAVE_LONG_LONG_INT + +diff -ru pax-utils-HEAD.orig/configure pax-utils-HEAD/configure +--- pax-utils-HEAD.orig/configure 2017-04-18 16:26:41.000000000 +0200 ++++ pax-utils-HEAD/configure 2017-04-18 16:28:03.000000000 +0200 +@@ -34537,6 +34537,19 @@ + + + ++for ac_header in linux/securebits.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "linux/securebits.h" "ac_cv_header_linux_securebits_h" "$ac_includes_default" ++if test "x$ac_cv_header_linux_securebits_h" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LINUX_SECUREBITS_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ + ac_config_files="$ac_config_files Makefile autotools/gnulib/Makefile" + + cat >confcache <<\_ACEOF +diff -ru pax-utils-HEAD.orig/configure.ac pax-utils-HEAD/configure.ac +--- pax-utils-HEAD.orig/configure.ac 2017-04-18 16:25:48.000000000 +0200 ++++ pax-utils-HEAD/configure.ac 2017-04-18 16:27:11.000000000 +0200 +#@@ -62,6 +62,8 @@ + AX_CHECK_COMPILE_FLAG(flag, AS_VAR_APPEND([CFLAGS], " flag")) + ]) + ++AC_CHECK_HEADERS([linux/securebits.h]) ++ + AC_CONFIG_FILES([ + Makefile + autotools/gnulib/Makefile +diff -ru pax-utils-HEAD.orig/porting.h pax-utils-HEAD/porting.h +--- pax-utils-HEAD.orig/porting.h 2017-03-03 21:07:15.000000000 +0100 ++++ pax-utils-HEAD/porting.h 2017-04-18 16:18:22.000000000 +0200 +@@ -46,7 +46,9 @@ + #endif + #if defined(__linux__) + # include <sys/prctl.h> +-# include <linux/securebits.h> ++# if !defined(HAVE_CONFIG_H) || defined(HAVE_LINUX_SECUREBITS_H) ++# include <linux/securebits.h> ++# endif + #endif + #if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__ANDROID__) + # include <byteswap.h> diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild deleted file mode 100644 index 42bba27..0000000 --- a/app-misc/pax-utils/pax-utils-1.2.2-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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}/${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 -} 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 index 31400b7..3904be7 100644 --- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild +++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild @@ -26,6 +26,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch "${FILESDIR}"/${P}-solaris.patch + "${FILESDIR}"/${P}-linux-2.6.32.patch "${FILESDIR}/${PN}-1.1.7-musl.patch" ) diff --git a/app-misc/pax-utils/pax-utils-1.2.2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2.ebuild deleted file mode 100644 index 1c32f97..0000000 --- a/app-misc/pax-utils/pax-utils-1.2.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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" - -_emake() { - emake \ - USE_CAP=$(usex caps) \ - USE_DEBUG=$(usex debug) \ - USE_PYTHON=$(usex python) \ - USE_SECCOMP=$(usex seccomp) \ - "$@" -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.1.7-musl.patch" -} - -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 -}
