- fix for missing list_last_entry macro in older kernels

diff --git a/ipset.spec b/ipset.spec
index d8513e40dfc1634b63d50e437741df88b4f6c63c..f1e9b9e40b872efb1481281d69ca47544dd8e54e 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -35,6 +35,7 @@ Group:                Networking/Admin
 Source0:       http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
 # Source0-md5: 8831b8f01458bf2abacc222884195a62
 Source1:       %{pname}.init
+Patch0:                list_last_entry.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -172,6 +173,7 @@ 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
new file mode 100644 (file)
index 0000000..41de94e
--- /dev/null
+++ b/list_last_entry.patch
@@ -0,0 +1,14 @@
+--- ipset/ipset-6.24/kernel/net/netfilter/ipset/ip_set_list_set.c~     2014-11-24 21:46:45.000000000 +0100
++++ ipset/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))