gentoo resync : 24.07.2021

4 files changed, 84 insertions, 7 deletions

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 70a5a5b2e8d0..b756263c33a6 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD pax-utils-1.3.1.ebuild 1875 BLAKE2B 990d153b2a24f2aedfcc54fdfbb2eeb8249f3d4874502da412c9c7f32a9981d54acab6729a037e988943177f6ad91796316da16451d8f6eda2648b12d98e8d71 SHA512 9c0f0ab27270718e52b7c1f386f15a668edf424a46bd477a5c1479f76280e94ecc13dc2b2370b97b921c66433123d0b8452c6ae17fb334075ac5c55b5a770449
-EBUILD pax-utils-1.3.2.ebuild 1843 BLAKE2B 515b433e95e9ddc438d1cc0e8c0b13dafff7b9797ce46d9c5de1c72176757f2e807cf57d9bf5839e879301c9bd69f1ebee2ed1ba46ca8cef5363ba3f736c1b68 SHA512 2839eabd7f534a2e417b13220b87f5bfa386da7024a234b86519bd550b54ba801d5cb0f20637843c211200b14e3e5a5330fb356ab3890e1edbb491df867b6abf
+DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
+EBUILD pax-utils-1.3.1.ebuild 1867 BLAKE2B 327542297176ddfbc3fbc6257f1d5c675ea78851d656f29812f2c153e4abfa8cb01c1b0e359dcfc3e8fe2ec0cb72ae89046fefff705775d220ca244602fcb6cb SHA512 ac2ff5161fbb3f7d6c5283f3f75c5f55ee6aded83b26101c326cf504f8ab8bc547be052eda326079b636441e85c69f0fd047fa8bf931dcad7a9f0016a137a347
+EBUILD pax-utils-1.3.2.ebuild 1830 BLAKE2B 9b676110512cad0ef77a7f6475357ba895970b102603585678d39b58d376a6e26016d51a9fbe70cc703b3da2022f49a0d202264a64226c6c0d3089a34e83ccfc SHA512 f8c9a4ebe6a9d0519d7dbef48c840b610334fa522150b8e2ae31d1bbd3f831880a74c1e2ac8ce204c9e341e3709b523acfd298076098a85132f8836982b7f4a2
+EBUILD pax-utils-1.3.3.ebuild 1835 BLAKE2B aa715968e80f4e6f908a79c0d4223625e23ac386e02a4830b9a586a610d95e4e13a22cfb770ed1dba66acb194cc5286e1f706e0e7bf28872b175a17bcda0f2b4 SHA512 d98639b4eec3f3d5b3464de67317f5bd83fa62a4e8302030d4b86699602bb11ce61c9d4796268bcd26cd0b5fc7c55b718a493f322bf6dbb825300e9a870b162e
 MISC metadata.xml 677 BLAKE2B 22c40493c7f29ed8f77b7d5c00d37c70cdc9713c4873c083483513955ec02e2a1fcea7106354d01a31b961072353d4e735c43f8b9cb5f90870931ed387f8208a SHA512 039c93e2ef3ffbd085a67a90163d36eab812691679a644696ebd856b84e09301505dd726387b1c26b619cbc0f17f9608e62ce8f3c3c80273dfaab64ee29d1818
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index 84b6622ff9a0..dc857708cfd6 100644
--- a/app-misc/pax-utils/pax-utils-1.3.1.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
@@ -22,7 +22,7 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyelftools[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-misc/pax-utils/pax-utils-1.3.2.ebuild b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
index 9be693bc86f3..0c1a64066b19 100644
--- a/app-misc/pax-utils/pax-utils-1.3.2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 toolchain-funcs
 
@@ -15,14 +15,14 @@ SRC_URI="mirror://gentoo/${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"
+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"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyelftools[${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
new file mode 100644
index 000000000000..0a9b82a4936b
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+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"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_USEDEP}]
+		')
+	)
+"
+# >=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; 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
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}