- updated to 7.4

- removed outdated kernel-5.* patches

diff --git a/ipset.spec b/ipset.spec
index 7bf7c23480843604aedf948a72ff0030c88e962d..6281d9d0cf05640ed78bb075c09edd3d7ea58726 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -27,16 +27,14 @@ exit 1
 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.3
+Version:       7.4
 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: a041d186097a23f1f87208f11144907e
+# Source0-md5: f9dda6f2fc3bb941e0ca3a6c292baf2c
 Source1:       %{pname}.init
-Patch0:                kernel-5.0.patch
-Patch1:                kernel-5.1.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -187,8 +185,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}

diff --git a/kernel-5.0.patch b/kernel-5.0.patch
deleted file mode 100644 (file)
index e9df12b..0000000
--- a/kernel-5.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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

diff --git a/kernel-5.1.patch b/kernel-5.1.patch
deleted file mode 100644 (file)
index d148aee..0000000
--- a/kernel-5.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h~    2018-12-10 18:35:31.000000000 +0100
-+++ ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h     2019-05-07 18:42:08.063827159 +0200
-@@ -666,8 +666,11 @@
-       spin_unlock_bh(&set->lock);
- 
-       /* Give time to other readers of the set */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
-+      synchronize_rcu();
-+#else
-       synchronize_rcu_bh();
--
-+#endif
-       pr_debug("set %s resized from %u (%p) to %u (%p)\n", set->name,
-                orig->htable_bits, orig, t->htable_bits, t);
-       /* If there's nobody else dumping the table, destroy it */