Author: arekm Date: Wed May 18 13:31:38 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.6.38.6; add ipset netlink patch (already in 2.6.39)
---- Files affected:
packages/linux-libc-headers:
linux-libc-headers.spec (1.169 -> 1.170) , ipset-netlink.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/linux-libc-headers/linux-libc-headers.spec
diff -u packages/linux-libc-headers/linux-libc-headers.spec:1.169
packages/linux-libc-headers/linux-libc-headers.spec:1.170
--- packages/linux-libc-headers/linux-libc-headers.spec:1.169 Tue Apr 12
22:05:37 2011
+++ packages/linux-libc-headers/linux-libc-headers.spec Wed May 18 15:31:33 2011
@@ -1,6 +1,6 @@
# $Revision$, $Date$
%define basever 2.6.38
-%define postver .2
+%define postver .6
Summary: Linux kernel headers for use with C libraries
Summary(pl.UTF-8): Nagłówki jądra Linuksa do użytku z bibliotekami C
Name: linux-libc-headers
@@ -13,7 +13,7 @@
# Source0-md5: 7d471477bfa67546f902da62227fa976
%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 599badab31c4920d4122133208c810d7
+# Source1-md5: 527fab8162c682ad849eb21fc30d28ef
%endif
Patch0: %{name}-esfq.patch
Patch1: %{name}-wrr.patch
@@ -23,6 +23,7 @@
Patch5: %{name}-pom-set.patch
Patch6: %{name}-atm-vbr.patch
Patch7: vserver.patch
+Patch8: ipset-netlink.patch
AutoReqProv: no
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.568
@@ -67,6 +68,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -113,6 +115,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.170 2011/05/18 13:31:33 arekm
+- up to 2.6.38.6; add ipset netlink patch (already in 2.6.39)
+
Revision 1.169 2011/04/12 20:05:37 arekm
- up to 2.6.38.2
================================================================
Index: packages/linux-libc-headers/ipset-netlink.patch
diff -u /dev/null packages/linux-libc-headers/ipset-netlink.patch:1.1
--- /dev/null Wed May 18 15:31:38 2011
+++ packages/linux-libc-headers/ipset-netlink.patch Wed May 18 15:31:33 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/linux-libc-headers/linux-libc-headers.spec?r1=1.169&r2=1.170&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
