From a29b87a4c625a74a47641b22125c9d780f4542da Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Thu, 1 Jul 2021 12:38:08 +0200 Subject: [PATCH] app-misc/pax-utils: update to upstream 1.3.1 This change syncs pax-utils to 1.3.1, bringin it on par with Gentoo upstream. A minor change is incuded in the ebuild (commented on in the file) to work around a build issue with our (outdated) python-single-r1.eclass. The workaround may be removed after we updated to a python version supported by upstream, and updated our eclasses respectively. The update fixes an issue with scanelf and glibc-2.33: /usr/lib/portage/python3.6/estrip: line 393: 1628751 Bad system call (core dumped) scanelf -yqRBF '#k%F' -k '.symtab' "$@" Signed-off-by: Thilo Fromm --- .../app-misc/pax-utils/Manifest | 2 + .../app-misc/pax-utils/metadata.xml | 11 ++- .../app-misc/pax-utils/pax-utils-1.3.1.ebuild | 88 +++++++++++++++++++ 3 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest index efb188b86c..98f0e90dfe 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest @@ -27,3 +27,5 @@ EBUILD pax-utils-1.1.ebuild 1448 SHA256 545bb6e66902d44db0d5f29e493ecfb6e3d8a846 MISC ChangeLog 7248 SHA256 873c22361b0ce72dd33cd8b1322c1f19628896fdea8ab6b8f7c59ec2b92d13a9 SHA512 14f7a33c18f91d556541cf28d1057d7a29df16d6d61f1370914fb8af27d76dbc4907db6e2d01908696d68a12801707e4af1719d36d9ea1fb308572e8c12be432 WHIRLPOOL 9c68121da26614b4be897a5b4070f72803c15b0b30b1b2af6ddb79ff1fc64608f51564637166b9111aefc296fdd82c142d55e91871474a9d3a05607fbfd27ab6 MISC ChangeLog-2015 25321 SHA256 d9fc5939318d48eb09554845e49ffdd2bd81d7700ea1a2eb3a245eac23de0523 SHA512 00829c624168f920c69bd64fcc4923d10df556d86484137c6f381d81a0f166e3f2b58559bf5a53d19a5fd608498b2b827b72d3bb31254e5e4b625dcbc6b88d05 WHIRLPOOL 2a6014ed7565ce08f011c6306592185831fa2a4c191eb9650c87927ba5715504cf958b6438ec28c7bfda9c3349fec8db3b39039abd97fb8a0b9ff3717bfff6a4 MISC metadata.xml 584 SHA256 5aa079a277468814cecc8dd01365e017de646a3786b561c001a7398e7747f047 SHA512 d8458090413d52aaa38b6867edf0a9f996e08b36f9750bfa2469c2aa7d6b0718157feace3dbbb3c63c2795e977ddd6a9c637223192dff90e8ca87facb730bdf4 WHIRLPOOL d745c0db8e85f85c968fea5408a05c6585d54774bc3f953b1debb0ec17b7ce5d942cd1e048026f1a790bc56aa20f3301f973c5e02dd5da24f47d725f6652f5be +DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102 +DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml index 73cd9cec1c..7837ad485c 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml @@ -2,11 +2,18 @@ - vapier@gentoo.org - Maintainer + slyfox@gentoo.org + Sergei Trofimovich + + + toolchain@gentoo.org + Gentoo Toolchain Project 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. Install a more powerful/faster version of lddtree + + cpe:/a:gentoo:pax-utils + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild new file mode 100644 index 0000000000..17882a0869 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit python-single-r1 toolchain-funcs + +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/~slyfox/distfiles/${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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps debug kernel_linux python seccomp" + +# NOTE this was originally +# +# RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) +# python? ( +# ${PYTHON_DEPS} +# $(python_gen_cond_dep ' +# dev-python/pyelftools[${PYTHON_MULTI_USEDEP}] +# ') +# ) +# " +# but we have an old version of python-single-r1.eclass which the +# above breaks. +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( + ${PYTHON_DEPS} + dev-python/pyelftools + ) +" + +# >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624 +DEPEND=" + ${RDEPEND} + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) ) +" +BDEPEND=" + caps? ( virtual/pkgconfig ) +" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || + has_version '