- rel 2

- fix build with linux 3.0

Changed files:
    ipset-kernel-3.0.patch -> 1.1
    ipset.spec -> 1.157

diff --git a/ipset-kernel-3.0.patch b/ipset-kernel-3.0.patch
new file mode 100644 (file)
index 0000000..7218d71
--- /dev/null
+++ b/ipset-kernel-3.0.patch
@@ -0,0 +1,20 @@
+--- ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c~    2012-04-06 22:33:28.410967308 +0200
++++ ipset-6.11/kernel/net/netfilter/ipset/ip_set_getport.c     2012-04-06 22:48:32.250775653 +0200
+@@ -8,7 +8,7 @@
+ /* Get Layer-4 data from the packets */
+ 
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3,0,0)
+ #include <linux/export.h>
+ #endif
+ #include <linux/ip.h>
+--- ipset-6.11/kernel/net/netfilter/ipset/pfxlen.c~    2012-01-13 21:26:37.000000000 +0100
++++ ipset-6.11/kernel/net/netfilter/ipset/pfxlen.c     2012-04-06 22:48:59.190670586 +0200
+@@ -1,5 +1,5 @@
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3,0,0)
+ #include <linux/export.h>
+ #endif
+ #include <linux/netfilter/ipset/pfxlen.h>

diff --git a/ipset.spec b/ipset.spec
index cfae26e3b8f39915cce35341608109272e432fff..a46fb5615882f328e506464c30bec2ba054e48ad 100644 (file)
--- a/ipset.spec
+++ b/ipset.spec
@@ -20,7 +20,7 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                pname   ipset
 Summary:       IP sets utility
 Summary(pl.UTF-8):     Narzędzie do zarządzania zbiorami IP
@@ -36,6 +36,7 @@ Source1:      %{pname}.init
 Patch0:                %{pname}-no_kernel.patch
 Patch1:                %{pname}-hash-net-if-fix.patch
 Patch2:                %{pname}-kernel-3.3.patch
+Patch3:                %{pname}-kernel-3.0.patch
 URL:           http://ipset.netfilter.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -137,6 +138,7 @@ Ten pakiet zawiera moduły jądra oferujące wsparcie dla zbiorów IP.
 %{!?with_kernel:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}