[gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/files/, sys-libs/libseccomp/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     e06dfa1a2fc15f638756134f0bedd61a2e4d0836
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 11:51:27 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 11:51:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e06dfa1a

sys-libs/libseccomp: Revbump to add missing SNR ppoll definitions

Bug: https://bugs.gentoo.org/700094
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../libseccomp-2.4.2-missing_SNR_ppoll_defs.patch  | 41 ++++++++++++++++++++++
 ...omp-2.4.2.ebuild => libseccomp-2.4.2-r1.ebuild} |  6 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
new file mode 100644
index 00000000000..9194706efa0
--- /dev/null
+++ b/sys-libs/libseccomp/files/libseccomp-2.4.2-missing_SNR_ppoll_defs.patch
@@ -0,0 +1,41 @@
+From e3647f5b6b52996bf30d0c2c1d1248e4182e1c1c Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Wed, 13 Nov 2019 13:36:10 +0100
+Subject: [PATCH] api: define __SNR_ppoll again
+
+Commit bf747eb21e428c2b3ead6ebcca27951b681963a0 accidentally removed the
+__SNR_ppoll definition. Add it back, using a PNR value if disabled in
+the kernel headers.
+
+Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
+Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
+Signed-off-by: Paul Moore <paul@paul-moore.com>
+---
+ include/seccomp-syscalls.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h
+index 6457592..3c958df 100644
+--- a/include/seccomp-syscalls.h
++++ b/include/seccomp-syscalls.h
+@@ -272,6 +272,7 @@
+ #define __PNR_timerfd_gettime64			-10238
+ #define __PNR_timerfd_settime64			-10239
+ #define __PNR_utimensat_time64			-10240
++#define __PNR_ppoll				-10241
+ 
+ /*
+  * libseccomp syscall definitions
+@@ -1359,6 +1360,12 @@
+ #define __SNR_poll			__PNR_poll
+ #endif
+ 
++#ifdef __NR_ppoll
++#define __SNR_ppoll			__NR_ppoll
++#else
++#define __SNR_ppoll			__PNR_ppoll
++#endif
++
+ #ifdef __NR_ppoll_time64
+ #define __SNR_ppoll_time64		__NR_ppoll_time64
+ #else

diff --git a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
similarity index 89%
rename from sys-libs/libseccomp/libseccomp-2.4.2.ebuild
rename to sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
index 6fc6a1ee79e..8e528f0bf02 100644
--- a/sys-libs/libseccomp/libseccomp-2.4.2.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.4.2-r1.ebuild
@@ -20,6 +20,10 @@ IUSE="static-libs"
 # version here, just be safe and pull in the latest stable ones. #551248
 DEPEND=">=sys-kernel/linux-headers-4.3"
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing_SNR_ppoll_defs.patch"
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -36,6 +40,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -type f -name libseccomp.la -delete
+	find "${ED}" -type f -name libseccomp.la -delete || die
 	einstalldocs
 }