Accepting request 568431 from security:netfilter

- Add 0001-build-do-install-libipset-args.h.patch.

OBS-URL: https://build.opensuse.org/request/show/568431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipset?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2018-01-25 11:35:48 +00:00 committed by Git OBS Bridge
commit 30bfe32006
3 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,27 @@
From a51c2d3fe33d047874028a26f136ecddd9671f79 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
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 <jengelh@inai.de>
---
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

View File

@ -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

View File

@ -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
@ -44,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
@ -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