- updated to 2.6.39

- removed obsolete ipset-netlink patch

Changed files:
    ipset-netlink.patch -> 1.2
    linux-libc-headers.spec -> 1.171

diff --git a/ipset-netlink.patch b/ipset-netlink.patch
deleted file mode 100644 (file)
index 2bb9cca..0000000
--- a/ipset-netlink.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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/linux-libc-headers.spec b/linux-libc-headers.spec
index 735eaaa4452d60f0c9b4e54885bc521b60cac7fd..eeae2748d9e1440f7fa539c9716868174d811b6a 100644 (file)
--- a/linux-libc-headers.spec
+++ b/linux-libc-headers.spec
@@ -1,5 +1,5 @@
-%define        basever 2.6.38
-%define        postver .6
+%define        basever 2.6.39
+%define        postver %{nil}
 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
@@ -9,7 +9,7 @@ Epoch:          7
 License:       GPL v2
 Group:         Development
 Source0:       http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5: 7d471477bfa67546f902da62227fa976
+# Source0-md5: 1aab7a741abe08d42e8eccf20de61e05
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5: 527fab8162c682ad849eb21fc30d28ef
@@ -22,7 +22,6 @@ Patch4:               %{name}-endian.patch
 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,7 +66,6 @@ bzip2 -dc %{SOURCE1} | patch -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,13 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 # provided by glibc-headers
-rm -rf $RPM_BUILD_ROOT%{_includedir}/scsi
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/scsi
 
 # currently provided by libdrm-devel
-rm -rf $RPM_BUILD_ROOT%{_includedir}/drm
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/drm
 
 # trash
-find $RPM_BUILD_ROOT%{_includedir} -type f -name '..install.cmd' -o -name '.install' | xargs rm
+find $RPM_BUILD_ROOT%{_includedir} -type f -name '..install.cmd' -o -name '.install' | xargs %{__rm}
 
 %clean
 rm -rf $RPM_BUILD_ROOT