From ec7d0e8e8f5d1dff19e26e52968490b5b7b6fd14af9131b947e27e6b287eecee Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 23 Mar 2016 16:07:30 +0000 Subject: [PATCH] - builderror-k316.diff: fixed upstream OBS-URL: https://build.opensuse.org/package/show/security/libseccomp?expand=0&rev=43 --- builderror-k316.diff | 28 ---------------------------- libseccomp.changes | 1 + libseccomp.spec | 3 +-- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 builderror-k316.diff diff --git a/builderror-k316.diff b/builderror-k316.diff deleted file mode 100644 index e34d374..0000000 --- a/builderror-k316.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Jan Engelhardt -Date: 2016-02-24 13:51:09.385315514 +0100 - -Fix a build error when your /usr/include/linux/seccomp.h exists, -but is "old enough". (Like openSUSE 13.2 / linux-glibc-devel 3.16). - ---- - src/system.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: libseccomp/src/system.h -=================================================================== ---- libseccomp.orig/src/system.h -+++ libseccomp/src/system.h -@@ -37,6 +37,13 @@ struct db_filter_col; - /* system header file */ - #include - -+#ifndef SECCOMP_SET_MODE_STRICT -+# define SECCOMP_SET_MODE_STRICT 0 -+#endif -+#ifndef SECCOMP_SET_MODE_FILTER -+# define SECCOMP_SET_MODE_FILTER 1 -+#endif -+ - #else - - /* NOTE: the definitions below were taken from the Linux Kernel sources */ diff --git a/libseccomp.changes b/libseccomp.changes index 49fe849..03a5922 100644 --- a/libseccomp.changes +++ b/libseccomp.changes @@ -2,6 +2,7 @@ Wed Mar 23 16:06:20 UTC 2016 - meissner@suse.com - updated to final 2.3.0 release +- builderror-k316.diff: fixed upstream ------------------------------------------------------------------- Wed Feb 24 10:11:26 UTC 2016 - jengelh@inai.de diff --git a/libseccomp.spec b/libseccomp.spec index 1bc8fe3..e228842 100644 --- a/libseccomp.spec +++ b/libseccomp.spec @@ -30,7 +30,6 @@ Source: https://github.com/seccomp/libseccomp/releases/download/v%versio Source2: https://github.com/seccomp/libseccomp/releases/download/v%version/%name-%version.tar.gz.SHA256SUM.asc Source99: baselibs.conf Patch1: no-static.diff -Patch2: builderror-k316.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake >= 1.11 @@ -98,7 +97,7 @@ This subpackage contains debug utilities for the seccomp interface. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build perl -i -pe 's{AC_INIT\(\[libseccomp\], \[0\.0\.0\]\)}{AC_INIT([libseccomp], [2.2.90])}' configure.ac