From 5e4edd691a184c65d0cb7f9e2221ae7752ab8e8829758ab289d99960cce79914 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 17 Feb 2020 13:21:30 +0000
Subject: [PATCH] Accepting request 774797 from
 home:scarabeus_iv:branches:security

- Add patch to fix ntpsec and others build (accidental drop of symbols):
  * SNR_ppoll.patch

OBS-URL: https://build.opensuse.org/request/show/774797
OBS-URL: https://build.opensuse.org/package/show/security/libseccomp?expand=0&rev=73
---
 SNR_ppoll.patch    | 41 +++++++++++++++++++++++++++++++++++++++++
 libseccomp.changes |  6 ++++++
 libseccomp.spec    |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 SNR_ppoll.patch

diff --git a/SNR_ppoll.patch b/SNR_ppoll.patch
new file mode 100644
index 0000000..c74908c
--- /dev/null
+++ b/SNR_ppoll.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/libseccomp.changes b/libseccomp.changes
index 4597a37..2bb7e89 100644
--- a/libseccomp.changes
+++ b/libseccomp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 17 08:10:13 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to fix ntpsec and others build (accidental drop of symbols):
+  * SNR_ppoll.patch
+
 -------------------------------------------------------------------
 Tue Jan  7 15:07:23 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
diff --git a/libseccomp.spec b/libseccomp.spec
index 29b55c5..d26c90c 100644
--- a/libseccomp.spec
+++ b/libseccomp.spec
@@ -31,6 +31,7 @@ Source3:        %name.keyring
 Source99:       baselibs.conf
 Patch1:         no-static.diff
 Patch2:         libseccomp-fix_aarch64-test.patch
+Patch3:         SNR_ppoll.patch
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.11
 BuildRequires:  fdupes