- up to 6.38

diff --git a/ipset.spec b/ipset.spec
index 5fa105e87417c804dc5feb906167b2fa2eacbdfb..2fbced36b0731bbc4a058b531e700284d53e0d45 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -22,19 +22,20 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     2
+%define                rel     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:       6.35
+Version:       6.38
 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: 8ffd6f69be4cf4d67a584163965b8701
+# Source0-md5: 0e5d9c85f6b78e7dff0c996e2900574b
 Source1:       %{pname}.init
+Patch0:                kernel-4.17.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-4.17.patch b/kernel-4.17.patch
new file mode 100644 (file)
index 0000000..0137012
--- /dev/null
+++ b/kernel-4.17.patch
@@ -0,0 +1,11 @@
+--- ipset-6.38/configure.ac~   2018-04-10 23:36:27.000000000 +0200
++++ ipset-6.38/configure.ac    2018-06-18 20:33:55.197510866 +0200
+@@ -345,7 +345,7 @@
+ 
+ AC_MSG_CHECKING([kernel source for id in struct pernet_operations])
+ if test -f $ksourcedir/include/net/net_namespace.h && \
+-   $AWK '/struct pernet_operations/ {for(i=1; i<=6; i++) {getline; print}}' $ksourcedir/include/net/net_namespace.h | $GREP -q 'int \*id;'; then
++   $AWK '/struct pernet_operations/ {for(i=1; i<=26; i++) {getline; print}}' $ksourcedir/include/net/net_namespace.h | $GREP -q 'int \*id;'; then
+       AC_MSG_RESULT(yes)
+       AC_SUBST(HAVE_NET_OPS_ID, define)
+ else