From 83f6c52967ecc5695f07828e243409a156534f7810766669b04bcd6fbc8f0ac4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 22 Jan 2018 21:52:40 +0000 Subject: [PATCH 1/2] - Add 0001-build-do-install-libipset-args.h.patch. OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=68 --- 0001-build-do-install-libipset-args.h.patch | 27 +++++++++++++++++++++ ipset.changes | 5 ++++ ipset.spec | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-build-do-install-libipset-args.h.patch diff --git a/0001-build-do-install-libipset-args.h.patch b/0001-build-do-install-libipset-args.h.patch new file mode 100644 index 0000000..58993f5 --- /dev/null +++ b/0001-build-do-install-libipset-args.h.patch @@ -0,0 +1,27 @@ +From a51c2d3fe33d047874028a26f136ecddd9671f79 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 22 Jan 2018 22:48:09 +0100 +Subject: [PATCH] build: do install libipset/args.h + +libipset/types.h includes args.h, therefore args.h must be installed +too. + +Signed-off-by: Jan Engelhardt +--- + include/libipset/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am +index 3b47518..79a1357 100644 +--- a/include/libipset/Makefile.am ++++ b/include/libipset/Makefile.am +@@ -1,5 +1,6 @@ + pkgincludedir = ${includedir}/libipset + pkginclude_HEADERS = \ ++ args.h \ + data.h \ + errcode.h \ + linux_ip_set_bitmap.h \ +-- +2.15.1 + diff --git a/ipset.changes b/ipset.changes index 6d90248..85e100d 100644 --- a/ipset.changes +++ b/ipset.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 22 21:49:31 UTC 2018 - jengelh@inai.de + +- Add 0001-build-do-install-libipset-args.h.patch. + ------------------------------------------------------------------- Sat Jan 6 21:47:52 UTC 2018 - jengelh@inai.de diff --git a/ipset.spec b/ipset.spec index 8fbb2bb..4f7d6a3 100644 --- a/ipset.spec +++ b/ipset.spec @@ -36,6 +36,7 @@ Url: http://ipset.netfilter.org/ Source: http://ipset.netfilter.org/%name-%version.tar.bz2 Source3: %name-preamble Patch1: ipset-destdir.diff +Patch2: 0001-build-do-install-libipset-args.h.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -104,7 +105,7 @@ when matching an entry against a set. %prep %setup -q -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build # build wants to call modinfo at some point From c41c6fca2bd3f7b60169554e04bf40c6763f98d2e929f72fd4fa1a4ebcdd47a4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 22 Jan 2018 21:58:03 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=69 --- ipset.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipset.spec b/ipset.spec index 4f7d6a3..c0916ce 100644 --- a/ipset.spec +++ b/ipset.spec @@ -45,7 +45,7 @@ BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig(libmnl) >= 1 %if 0%{?ipset_build_kmp} BuildRequires: %kernel_module_package_buildreqs -BuildRequires: kernel-syms >= 2.6.39 +BuildRequires: kernel-devel >= 2.6.39 %kernel_module_package -p %name-preamble %if 0%{?suse_version} >= 1320 BuildRequires: kmod-compat