New upstream version (#1858965)

.gitignore

@@ -14,3 +14,4 @@
 /libseccomp-2.4.0.tar.gz
 /libseccomp-2.4.1.tar.gz
 /libseccomp-2.4.2.tar.gz
+/libseccomp-2.5.0.tar.gz

0001-api-define-__SNR_ppoll-again.patch

@@ -1,44 +0,0 @@
-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
--- 
-2.23.0
-

0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch

@@ -1,40 +0,0 @@
-From 1ecdddb2a5b61cf527d1f238f88a9d129239f87a Mon Sep 17 00:00:00 2001
-From: Paul Moore <paul@paul-moore.com>
-Date: Tue, 5 Nov 2019 15:11:11 -0500
-Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls
-
-We recently changed how libseccomp handles syscall numbers that are
-not defined natively, but we missed test #15.
-
-Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- tests/15-basic-resolver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c
-index 6badef1..0c1eefe 100644
---- a/tests/15-basic-resolver.c
-+++ b/tests/15-basic-resolver.c
-@@ -55,15 +55,15 @@ int main(int argc, char *argv[])
- 	unsigned int arch;
- 	char *name = NULL;
- 
--	if (seccomp_syscall_resolve_name("open") != __NR_open)
-+	if (seccomp_syscall_resolve_name("open") != __SNR_open)
- 		goto fail;
--	if (seccomp_syscall_resolve_name("read") != __NR_read)
-+	if (seccomp_syscall_resolve_name("read") != __SNR_read)
- 		goto fail;
- 	if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR)
- 		goto fail;
- 
- 	rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat");
--	if (rc != __NR_openat)
-+	if (rc != __SNR_openat)
- 		goto fail;
- 
- 	while ((arch = arch_list[iter++]) != -1) {
--- 
-2.23.0
-

libseccomp.spec

@@ -1,16 +1,15 @@
 Name:           libseccomp
-Version:        2.4.2
+Version:        2.5.0
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Enhanced seccomp library
 License:        LGPLv2
 URL:            https://github.com/seccomp/libseccomp
 Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
 # Backports from upstream
-Patch0001:      0001-api-define-__SNR_ppoll-again.patch
-Patch0002:      0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch
 
 BuildRequires:  gcc
+BuildRequires:  gperf
 BuildRequires:  make
 
 %ifnarch riscv64 s390
@@ -91,6 +90,9 @@ rm -f tests/36-sim-ipc_syscalls.tests tests/37-sim-ipc_syscalls_be.tests
 %{_libdir}/libseccomp.a
 
 %changelog
+* Fri Jul 24 2020 Neal Gompa <ngompa13@gmail.com> - 2.5.0-1
+- New upstream version (#1858965)
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libseccomp-2.4.2.tar.gz) = 375a3c7c658be6a08b9bb30963e10bb49e8e066119e0be6d3d97faac3db18b8e2c6938d8b5d3874b2f5331ec8295170112fbae83b5a3b5a5bebc0d6705bdfdbb
+SHA512 (libseccomp-2.5.0.tar.gz) = 00ef5aeb4db8dafb546ae680b2d6d9b6aeed008df805d0f28f9dd15c074ff6ea7a5e5131ab503825b8011c59aa23046baedd5849ca040aa73352f43ab2d602ae