From caed241b0a9be1d34baed45d7a51c687826e4863 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 22 Apr 2024 07:10:36 +0000 Subject: [PATCH] app-misc/pax-utils: Sync with Gentoo It's from Gentoo commit b7ea1f061b451c92ef209f8821a6eae70b97bb9c. --- .../app-misc/pax-utils/Manifest | 1 - ...ls-1.3.5-man-reorder-xmlto-arguments.patch | 30 ------- .../app-misc/pax-utils/pax-utils-1.3.5.ebuild | 82 ------------------- .../app-misc/pax-utils/pax-utils-1.3.7.ebuild | 2 +- .../app-misc/pax-utils/pax-utils-9999.ebuild | 4 +- 5 files changed, 3 insertions(+), 116 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.5.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 40dd6f42a7..4a045ee193 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 @@ -1,2 +1 @@ -DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836 DIST pax-utils-1.3.7.tar.xz 113740 BLAKE2B d801df9c426f318c871655f238fe27b53e656c2789ef8508019997c98bbc540987b611642d87e76ae9f76a95f6cce1acd0b10e3491a146d1e3b3f727a6f96bdc SHA512 f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576 diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch deleted file mode 100644 index 909c69e096..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2d981305b117b669c60bede076557c2d765cf198 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Wed, 7 Sep 2022 20:13:00 -0400 -Subject: [PATCH] man: reorder xmlto arguments - -Bug: https://bugs.gentoo.org/869110 -Thanks-to: Fabian Groffen -Signed-off-by: Mike Gilbert ---- - man/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/meson.build b/man/meson.build -index fc8d183..2e346ec 100644 ---- a/man/meson.build -+++ b/man/meson.build -@@ -25,8 +25,8 @@ endforeach - - custom_target('docbook_to_man', - command : [ -- xmlto, 'man', '-x', files('custom.xsl'), '--skip-validation', book, -- '-o', meson.current_build_dir() -+ xmlto, '-x', files('custom.xsl'), '--skip-validation', -+ '-o', meson.current_build_dir(), 'man', book - ], - input : [ - 'pax-utils.docbook.in', 'custom.xsl', 'fragment/reftail', --- -2.37.3 - diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.5.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.5.ebuild deleted file mode 100644 index 61d80fca90..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: if bumping pax-utils because of syscall changes in glibc, please -# revbump glibc and update the dependency in its ebuild for the affected -# versions. -PYTHON_COMPAT=( python3_{10..11} ) - -inherit meson python-single-r1 - -DESCRIPTION="ELF utils that can check files for security relevant properties" -HOMEPAGE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps +man python seccomp test" - -_PYTHON_DEPS=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pyelftools[${PYTHON_USEDEP}] - ') -" - -RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) - python? ( ${_PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - caps? ( virtual/pkgconfig ) - man? ( app-text/xmlto ) - - python? ( ${_PYTHON_DEPS} ) -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( python ) -" -RESTRICT=" - !test? ( test ) -" - -PATCHES=( - "${FILESDIR}/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch" -) - -pkg_setup() { - if use test || use python; then - python-single-r1_pkg_setup - fi -} - -src_configure() { - local emesonargs=( - "-Dlddtree_implementation=$(usex python python sh)" - $(meson_feature caps use_libcap) - $(meson_feature man build_manpages) - $(meson_use seccomp use_seccomp) - $(meson_use test tests) - - # fuzzing is currently broken - -Duse_fuzzing=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - - use python && python_fix_shebang "${ED}"/usr/bin/lddtree -} diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild index 533f1b106d..5b93dc47b7 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Note: if bumping pax-utils because of syscall changes in glibc, please # revbump glibc and update the dependency in its ebuild for the affected # versions. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-9999.ebuild index 26cbf8dbb9..191841deb4 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Note: if bumping pax-utils because of syscall changes in glibc, please # revbump glibc and update the dependency in its ebuild for the affected # versions. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit meson python-single-r1