packages: ipset/ipset.spec, ipset/ipset-hash-net-if-fix.patch (NEW) - ipset...

[kosmo]

Author: kosmo                        Date: Sat Aug 13 12:00:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ipset: Fix interface name matching in hash:net,iface.

---- Files affected:
packages/ipset:
   ipset.spec (1.125 -> 1.126) , ipset-hash-net-if-fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.125 packages/ipset/ipset.spec:1.126
--- packages/ipset/ipset.spec:1.125	Sat Jul 23 19:40:57 2011
+++ packages/ipset/ipset.spec	Sat Aug 13 14:00:24 2011
@@ -36,6 +36,7 @@
 Source1:	%{pname}.init
 Patch0:		%{pname}-config_dist.patch
 Patch1:		%{pname}-no_kernel.patch
+Patch2:		%{pname}-hash-net-if-fix.patch
 URL:		http://ipset.netfilter.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -139,6 +140,7 @@
 %else
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -235,6 +237,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2011/08/13 12:00:24  kosmo
+- ipset: Fix interface name matching in hash:net,iface.
+
 Revision 1.125  2011/07/23 17:40:57  arekm
 - release 2
 

================================================================
Index: packages/ipset/ipset-hash-net-if-fix.patch
diff -u /dev/null packages/ipset/ipset-hash-net-if-fix.patch:1.1
--- /dev/null	Sat Aug 13 14:00:30 2011
+++ packages/ipset/ipset-hash-net-if-fix.patch	Sat Aug 13 14:00:24 2011
@@ -0,0 +1,30 @@
+diff -urN ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
+--- ipset-6.8.orig/kernel/net/netfilter/ipset/ip_set_hash_netiface.c	2011-07-08 10:13:53.000000000 +0200
++++ ipset-6.8/kernel/net/netfilter/ipset/ip_set_hash_netiface.c	2011-08-13 09:58:01.456999822 +0200
+@@ -41,25 +41,7 @@
+ static inline long
+ ifname_compare(const char *_a, const char *_b)
+ {
+-	const long *a = (const long *)_a;
+-	const long *b = (const long *)_b;
+-
+-	BUILD_BUG_ON(IFNAMSIZ > 4 * sizeof(unsigned long));
+-	if (a[0] != b[0])
+-		return a[0] - b[0];
+-	if (IFNAMSIZ > sizeof(long)) {
+-		if (a[1] != b[1])
+-			return a[1] - b[1];
+-	}
+-	if (IFNAMSIZ > 2 * sizeof(long)) {
+-		if (a[2] != b[2])
+-			return a[2] - b[2];
+-	}
+-	if (IFNAMSIZ > 3 * sizeof(long)) {
+-		if (a[3] != b[3])
+-			return a[3] - b[3];
+-	}
+-	return 0;
++	return strcmp(_a, _b);
+ }
+ 
+ static void
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.spec?r1=1.125&r2=1.126&f=u