- fix building with kernel 5.0

diff --git a/ipset.spec b/ipset.spec
index 44334f758c4a93b3cec5627710cfd479d48d70b8..7f310f2caa5e06d89ce7a7a4d73f3537657a1da5 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -35,6 +35,7 @@ Group:                Networking/Admin
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
 # Source0-md5: 72b477d1ce076d681b0799f88280f2f3
 Source1:       %{pname}.init
+Patch0:                kernel-5.0.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -185,6 +186,7 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}

diff --git a/kernel-5.0.patch b/kernel-5.0.patch
new file mode 100644 (file)
index 0000000..c6f65a9
--- /dev/null
+++ b/kernel-5.0.patch
@@ -0,0 +1,11 @@
+--- ipset-7.1/configure.ac~    2018-12-10 18:35:31.000000000 +0100
++++ ipset-7.1/configure.ac     2019-03-10 18:03:26.965123071 +0100
+@@ -581,7 +581,7 @@
+ 
+ AC_MSG_CHECKING([kernel source for netlink extended ACK])
+ if test -f $ksourcedir/include/linux/netlink.h && \
+-   $AWK '/^extern void netlink_ack\(/,/\)/' $ksourcedir/include/linux/netlink.h | $GREP -q 'const struct netlink_ext_ack'; then
++   $AWK '/^void netlink_ack\(/,/\)/' $ksourcedir/include/linux/netlink.h | $GREP -q 'const struct netlink_ext_ack'; then
+       AC_MSG_RESULT(yes)
+       AC_SUBST(HAVE_NETLINK_EXTENDED_ACK, define)
+ else