- rel 5; add ipset netlink patch

Changed files:
    ipset-netlink.patch -> 1.1
    kernel.spec -> 1.921

diff --git a/ipset-netlink.patch b/ipset-netlink.patch
new file mode 100644 (file)
index 0000000..2bb9cca
--- /dev/null
+++ b/ipset-netlink.patch
@@ -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)
+ 
+

diff --git a/kernel.spec b/kernel.spec
index e62421a4f06f972a47dd22cfdfb08f22425199c9..b6dd753bc3c2b79103bb96d7b0b9b4c124364325 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -94,7 +94,7 @@
 
 %define                basever         2.6.38
 %define                postver         .6
-%define                rel             4
+%define                rel             5
 
 %define                _enable_debug_packages                  0
 
@@ -291,6 +291,9 @@ Patch2300:  kernel-drm-intel-2011Q1.patch
 # (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