- up to 7.19

diff --git a/ipset.spec b/ipset.spec
index bb3751313dabb2f5e67b25a50a70bbc3f9a47e4b..720b878658fc1e242f245ad1694255c2b9c399b0 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -22,20 +22,19 @@ 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:       7.15
+Version:       7.19
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Networking/Admin
 #Source0Download: https://ipset.netfilter.org/install.html
 Source0:       https://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: b681a86dbdb2d9726245af739bca01ac
+# Source0-md5: 34b92f93292e6114aede1a0f18a75251
 Source1:       %{pname}.init
-Patch0:                kernel-5.16.patch
 URL:           https://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -185,7 +184,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}

diff --git a/kernel-5.16.patch b/kernel-5.16.patch
deleted file mode 100644 (file)
index 06d55e0..0000000
--- a/kernel-5.16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ipset-7.15/configure.ac~   2021-08-04 08:18:14.000000000 +0200
-+++ ipset-7.15/configure.ac    2022-01-20 22:11:42.308828836 +0100
-@@ -450,7 +450,7 @@
- 
- AC_MSG_CHECKING([kernel source for kvfree])
- if test -f $ksourcedir/include/linux/mm.h && \
--   $GREP -q 'kvfree' $ksourcedir/include/linux/mm.h; then
-+   $GREP -q 'kvfree' $ksourcedir/include/linux/mm.h $ksourcedir/include/linux/slab.h; then
-       AC_MSG_RESULT(yes)
-       AC_SUBST(HAVE_KVFREE, define)
- else
---- ipset-7.15/configure.ac~   2022-01-20 22:12:29.000000000 +0100
-+++ ipset-7.15/configure.ac    2022-01-20 22:13:17.434329590 +0100
-@@ -839,7 +839,7 @@
- 
- AC_MSG_CHECKING([kernel source for kvzalloc() in mm.h])
- if test -f $ksourcedir/include/linux/mm.h && \
--   $GREP -q 'static inline void \*kvzalloc(' $ksourcedir/include/linux/mm.h; then
-+   $GREP -q ' void \*kvzalloc(' $ksourcedir/include/linux/mm.h $ksourcedir/include/linux/slab.h; then
-       AC_MSG_RESULT(yes)
-       AC_SUBST(HAVE_KVZALLOC, define)
- else