From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 9 Mar 2019 21:56:13 +0000 (+0100)
Subject: - up to 7.1, doesn't build with kernel 5.0
X-Git-Tag: auto/th/ipset-7.1-1~3
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fipset.git;a=commitdiff_plain;h=036276e

- up to 7.1, doesn't build with kernel 5.0
---

diff --git a/build.patch b/build.patch
deleted file mode 100644
index 218a3b6..0000000
--- a/build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 21c9f79121abb70324efe9fc19ef0fb3685afb1a
-Author: Florent Fourcot <florent.fourcot@wifirst.fr>
-Date:   Tue Nov 27 17:15:56 2018 +0100
-
-    netfilter: ipset: fix ip_set_byindex function
-    
-    New function added by "Introduction of new commands and protocol
-    version 7" is not working, since we return skb2 to user
-    
-    Signed-off-by: Victorien Molle <victorien.molle@wifirst.fr>
-    Signed-off-by: Florent Fourcot <florent.fourcot@wifirst.fr>
-    Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-
-diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
-index c2e32ee..b93805c 100644
---- a/kernel/net/netfilter/ipset/ip_set_core.c
-+++ b/kernel/net/netfilter/ipset/ip_set_core.c
-@@ -1976,7 +1976,7 @@ IPSET_CBFN(ip_set_byindex, struct net *net, struct sock *ctnl,
- 	if (!nlh2)
- 		goto nlmsg_failure;
- 	if (nla_put_u8(skb2, IPSET_ATTR_PROTOCOL, protocol(attr)) ||
--	    nla_put_string(skb, IPSET_ATTR_SETNAME, set->name))
-+	    nla_put_string(skb2, IPSET_ATTR_SETNAME, set->name))
- 		goto nla_put_failure;
- 	nlmsg_end(skb2, nlh2);
- 
---- ipset-7.0/configure.ac~	2018-10-27 18:09:10.000000000 +0200
-+++ ipset-7.0/configure.ac	2018-12-03 19:36:17.306201572 +0100
-@@ -499,7 +499,7 @@ fi
- AC_MSG_CHECKING([kernel source for struct net in struct nfnl_callback])
- if test -f $ksourcedir/include/linux/netfilter/nfnetlink.h && \
-    $AWK '/^struct nfnl_callback /,/^}/' $ksourcedir/include/linux/netfilter/nfnetlink.h | \
--   $GREP -q 'struct net'; then
-+   $GREP 'call)' | $GREP -q 'struct net'; then
- 	AC_MSG_RESULT(yes)
- 	AC_SUBST(HAVE_NET_IN_NFNL_CALLBACK_FN, define)
- else
diff --git a/ipset.spec b/ipset.spec
index ce0857d..44334f7 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -22,20 +22,19 @@ exit 1
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	2
+%define		rel	0.1
 %define		pname	ipset
 Summary:	IP sets utility
 Summary(pl.UTF-8):	Narzędzie do zarządzania zbiorami IP
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:	7.0
+Version:	7.1
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Networking/Admin
 #Source0Download: http://ipset.netfilter.org/install.html
 Source0:	http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5:	64c4e2e7123481c9db7ee1df127d9531
+# Source0-md5:	72b477d1ce076d681b0799f88280f2f3
 Source1:	%{pname}.init
-Patch0:		build.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -186,7 +185,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}