From 2fb10c0f8f71e70e590880ea3bac9009418e5eb5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 18 Apr 2021 14:32:29 -0400
Subject: app-misc/pax-utils: restore missing seccomp syscalls

Closes: https://bugs.gentoo.org/783459
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 app-misc/pax-utils/Manifest               |  2 +-
 app-misc/pax-utils/pax-utils-1.3.1.ebuild | 77 +++++++++++++++++++++++++++++++
 app-misc/pax-utils/pax-utils-1.3.ebuild   | 76 ------------------------------
 3 files changed, 78 insertions(+), 77 deletions(-)
 create mode 100644 app-misc/pax-utils/pax-utils-1.3.1.ebuild
 delete mode 100644 app-misc/pax-utils/pax-utils-1.3.ebuild

(limited to 'app-misc')

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 7b4c152d3279..51100233c365 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,2 +1,2 @@
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
-DIST pax-utils-1.3.tar.xz 717672 BLAKE2B 56e9677b96e38d8efbe0f1fd3e8d92f30b636a87a25cb73fc7452bd34546b25bc0c7dd05133ac99c88cbdb403a8a261f1ba55f6ba80d4571fd907284255c0e2c SHA512 8c200a217ca0a6f8dda74af9216f244d1ddb93ace1b853428cfcd26d1e0429ae199ebf54376ee3885f43ae42445341c76e1ee846def68376ae7aa63a788eeeab
+DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
diff --git a/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
new file mode 100644
index 000000000000..64854b1beb39
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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/distfiles/${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_MULTI_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 ||
+		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
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-1.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.ebuild
deleted file mode 100644
index 786da67c364c..000000000000
--- a/app-misc/pax-utils/pax-utils-1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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"
-
-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_MULTI_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 ||
-		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
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
-- 
cgit v1.2.3-65-gdbad