packages: ipset/ipset.spec, ipset/ipset-kernel-3.0.patch (NEW)=?UTF-8?Q?=20?=- rel 2 - fi...

[baggins]

Author: baggins                      Date: Fri Apr  6 20:50:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix build with linux 3.0

---- Files affected:
packages/ipset:
   ipset.spec (1.156 -> 1.157) , ipset-kernel-3.0.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.156 packages/ipset/ipset.spec:1.157
--- packages/ipset/ipset.spec:1.156	Fri Apr  6 22:44:00 2012
+++ packages/ipset/ipset.spec	Fri Apr  6 22:50:04 2012
@@ -21,7 +21,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
@@ -37,6 +37,7 @@
 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
@@ -138,6 +139,7 @@
 %{!?with_kernel:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -234,6 +236,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2012/04/06 20:50:04  baggins
+- rel 2
+- fix build with linux 3.0
+
 Revision 1.156  2012/04/06 20:44:00  baggins
 - rel 1
 

================================================================
Index: packages/ipset/ipset-kernel-3.0.patch
diff -u /dev/null packages/ipset/ipset-kernel-3.0.patch:1.1
--- /dev/null	Fri Apr  6 22:50:09 2012
+++ packages/ipset/ipset-kernel-3.0.patch	Fri Apr  6 22:50:04 2012
@@ -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>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ipset/ipset.spec?r1=1.156&r2=1.157