[packages/ipset] - up to 6.29

[baggins]

commit 7ae2f2bc8d14d59f8dd8e014d0a1d4f25e4418bd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jun 6 20:38:30 2016 +0200

    - up to 6.29

 ipset.spec            |  6 ++----
 list_last_entry.patch | 14 --------------
 2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/ipset.spec b/ipset.spec
index 890bff0..362b56f 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -27,15 +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:	6.26
+Version:	6.29
 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:	5ec4e79053a30fb6d72e0549d7d09343
+# Source0-md5:	fd8ea35997115c5c630eee22f0beecec
 Source1:	%{pname}.init
-Patch0:		list_last_entry.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -173,7 +172,6 @@ done\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 %build
 %if %{with userspace}
diff --git a/list_last_entry.patch b/list_last_entry.patch
deleted file mode 100644
index c664d8c..0000000
--- a/list_last_entry.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ipset-6.24/kernel/net/netfilter/ipset/ip_set_list_set.c~	2014-11-24 21:46:45.000000000 +0100
-+++ ipset-6.24/kernel/net/netfilter/ipset/ip_set_list_set.c	2015-01-28 19:09:21.324834608 +0100
-@@ -280,7 +280,11 @@
- 	if (d->before == 0) {
- 		/* Append  */
- 		n = list_empty(&map->members) ? NULL :
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
- 		    list_last_entry(&map->members, struct set_elem, list);
-+#else
-+		    list_entry((&map->members)->prev, struct set_elem, list);
-+#endif
- 	} else if (d->before > 0) {
- 		/* Insert after next element */
- 		if (!list_is_last(&next->list, &map->members))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/7ae2f2bc8d14d59f8dd8e014d0a1d4f25e4418bd