gentoo auto-resync : 06:01:2023 - 12:11:06

3 files changed, 95 insertions, 18 deletions

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 19fa5632e165..9a7df707b0d4 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,7 @@
 AUX pax-utils-1.3.5-man-reorder-xmlto-arguments.patch 921 BLAKE2B c97680a374985c23602c98227ad8045f2dbeedd5c5a23374b26f7ce30fe0dedc789077229c4fed4bd8cc18ecb8e9c61f9a13a768dfcb500165e120ef7a7a7d06 SHA512 74ff3095b188c4f88608952b7619297c385dec98df16b336a3ad7fcd2c2514542c4e0053664e81400a729a8183d6a84fd04202826e143c63a4e5aff133f6a071
 DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
+DIST pax-utils-1.3.6.tar.xz 113816 BLAKE2B de33820acc5cbbace2f7e3f831dc1c4d2ead58e1b0418c96ef42694d7f0cc1d49a37764d6f8b60a00aaa25fd3d40ba64fb4cf1798e07b917936704738e6f1042 SHA512 94d6bdcac0109cc7218fc523594100b4bb5877e0709f5443903ae8aca96e8f3f45cf47b28b57ac146caf6713ad7895a6f67adf4364d9a14986c8b7e0399f3865
 EBUILD pax-utils-1.3.5.ebuild 1970 BLAKE2B e3c67c370df7ec3c695216ed3f2879b24ca78ae2d99f0caeb5f12aee45a142f584a335cd8d2c24f148280ea3c26e8fd895a6af92be52eaa59eddf50939b97a10 SHA512 1b6cf737bb31ae270547578cb5a869a5d1903dde91156c61bb992ffcc1389c662fb3152b6734c0d9d05c77eb49201f9537938073dd1f6377afa3bb34489aa70c
-EBUILD pax-utils-9999.ebuild 1912 BLAKE2B e70d992c11df700503c62b31746251d7228b6d57b41f59b1f5f667ecebc019b3e30311268a415cf9bebfda92c94e68b31f1d41e8266f572f338a2295e5832752 SHA512 c839c87166845284074d0e53084625e72da5b24e47e6f4d567d0688298d81facc731fee26c0347d54be65198a811384b582c080486cd3b2a7dd94cf14a9da800
+EBUILD pax-utils-1.3.6.ebuild 1913 BLAKE2B ca26957882c6bbfc6b06634895ed2b3d070efe365f8ddf5d7968f344c6c2b62292635fa8c7b577f331b2ff6c0c65c46f37d15eb7393f0f8d591d24eef6d7c348 SHA512 0737b0e5735e001af77119cbbb801811176722460226fe54ab2337a79c7712832ef094a29bc9eefd42c4dcf587dc4fd65b3caa9abb29a6e34ebe51460d1ed59b
+EBUILD pax-utils-9999.ebuild 1913 BLAKE2B ca26957882c6bbfc6b06634895ed2b3d070efe365f8ddf5d7968f344c6c2b62292635fa8c7b577f331b2ff6c0c65c46f37d15eb7393f0f8d591d24eef6d7c348 SHA512 0737b0e5735e001af77119cbbb801811176722460226fe54ab2337a79c7712832ef094a29bc9eefd42c4dcf587dc4fd65b3caa9abb29a6e34ebe51460d1ed59b
 MISC metadata.xml 780 BLAKE2B a1bd460e70b7a2a4bc0e5012fb28a31890ebe745e9d1d99ad427b0382d9df9ffb8363dbf8907aef9e35da0ee59e489b80f084dce205250040d437ccc229ce49c SHA512 61246256f126a5533829b7e0af50168e7a7395f98fc21a64abc970955892874bc690901a36f791bd73a36e7b659e3843b63c504a9f360c5e41f1ce3678b08b5e
diff --git a/app-misc/pax-utils/pax-utils-1.3.6.ebuild b/app-misc/pax-utils/pax-utils-1.3.6.ebuild
new file mode 100644
index 000000000000..599c1ab4a187
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.6.ebuild
@@ -0,0 +1,77 @@
+# 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_{8..11} )
+
+inherit meson python-single-r1
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project: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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +man python seccomp test"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
+
+MY_PYTHON_DEPS="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="
+	caps? ( >=sys-libs/libcap-2.24 )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	caps? ( virtual/pkgconfig )
+	man? ( app-text/xmlto )
+	python? ( ${MY_PYTHON_DEPS} )
+"
+
+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/app-misc/pax-utils/pax-utils-9999.ebuild b/app-misc/pax-utils/pax-utils-9999.ebuild
index 9aae26cb7eaf..599c1ab4a187 100644
--- a/app-misc/pax-utils/pax-utils-9999.ebuild
+++ b/app-misc/pax-utils/pax-utils-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,39 +17,37 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pax-utils.git"
 	inherit git-r3
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+	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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="caps +man python seccomp test"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )
+"
+RESTRICT="!test? ( test )"
 
-_PYTHON_DEPS="
+MY_PYTHON_DEPS="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/pyelftools[${PYTHON_USEDEP}]
 	')
 "
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( ${_PYTHON_DEPS} )
+RDEPEND="
+	caps? ( >=sys-libs/libcap-2.24 )
+	python? ( ${MY_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 )
+	python? ( ${MY_PYTHON_DEPS} )
 "
 
 pkg_setup() {