packages: kernel/kernel.spec, kernel/ipset-netlink.patch (NEW) - rel 5; add...

[arekm]

Author: arekm                        Date: Wed May 18 12:06:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; add ipset netlink patch

---- Files affected:
packages/kernel:
   kernel.spec (1.920 -> 1.921) , ipset-netlink.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.920 packages/kernel/kernel.spec:1.921
--- packages/kernel/kernel.spec:1.920	Wed May 18 11:51:31 2011
+++ packages/kernel/kernel.spec	Wed May 18 14:05:58 2011
@@ -95,7 +95,7 @@
 
 %define		basever		2.6.38
 %define		postver		.6
-%define		rel		4
+%define		rel		5
 
 %define		_enable_debug_packages			0
 
@@ -292,6 +292,9 @@
 # (only warnings, so just remove parts of this patch if conflics)
 Patch2500:	kernel-warnings.patch
 
+# from ipset.spec (already in 2.6.39)
+Patch2600:	ipset-netlink.patch
+
 # 0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
 # 0002-AppArmor-compatibility-patch-for-v5-interface.patch
 # from http://kernel.org/pub/linux/security/apparmor/apparmor-2.6.36-patches.tgz
@@ -1548,6 +1551,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.921  2011/05/18 12:05:58  arekm
+- rel 5; add ipset netlink patch
+
 Revision 1.920  2011/05/18 09:51:31  arekm
 - rel 4; another bugfix
 

================================================================
Index: packages/kernel/ipset-netlink.patch
diff -u /dev/null packages/kernel/ipset-netlink.patch:1.1
--- /dev/null	Wed May 18 14:06:03 2011
+++ packages/kernel/ipset-netlink.patch	Wed May 18 14:05:58 2011
@@ -0,0 +1,47 @@
+diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
+index 361d6b5..2b11fc1 100644
+--- a/include/linux/netfilter/nfnetlink.h
++++ b/include/linux/netfilter/nfnetlink.h
+@@ -47,7 +47,8 @@ struct nfgenmsg {
+ #define NFNL_SUBSYS_QUEUE		3
+ #define NFNL_SUBSYS_ULOG		4
+ #define NFNL_SUBSYS_OSF			5
+-#define NFNL_SUBSYS_COUNT		6
++#define NFNL_SUBSYS_IPSET		6
++#define NFNL_SUBSYS_COUNT		7
+ 
+ #ifdef __KERNEL__
+ 
+diff --git a/include/net/netlink.h b/include/net/netlink.h
+index 373f1a9..8a3906a 100644
+--- a/include/net/netlink.h
++++ b/include/net/netlink.h
+@@ -856,18 +856,27 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
+ #define NLA_PUT_BE16(skb, attrtype, value) \
+ 	NLA_PUT_TYPE(skb, __be16, attrtype, value)
+ 
++#define NLA_PUT_NET16(skb, attrtype, value) \
++	NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)
++
+ #define NLA_PUT_U32(skb, attrtype, value) \
+ 	NLA_PUT_TYPE(skb, u32, attrtype, value)
+ 
+ #define NLA_PUT_BE32(skb, attrtype, value) \
+ 	NLA_PUT_TYPE(skb, __be32, attrtype, value)
+ 
++#define NLA_PUT_NET32(skb, attrtype, value) \
++	NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)
++
+ #define NLA_PUT_U64(skb, attrtype, value) \
+ 	NLA_PUT_TYPE(skb, u64, attrtype, value)
+ 
+ #define NLA_PUT_BE64(skb, attrtype, value) \
+ 	NLA_PUT_TYPE(skb, __be64, attrtype, value)
+ 
++#define NLA_PUT_NET64(skb, attrtype, value) \
++	NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)
++
+ #define NLA_PUT_STRING(skb, attrtype, value) \
+ 	NLA_PUT(skb, attrtype, strlen(value) + 1, value)
+ 
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.920&r2=1.921&f=u