[arch-commits] Commit in kernel-headers/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Sun Jun 22 20:06:08 UTC 2008
Date: Sunday, June 22, 2008 @ 16:06:08
Author: jgc
Revision: 3465
upgpkg: kernel-headers 2.6.25.8-1
Add upstream patch to fix FS#10728
Added:
kernel-headers/trunk/netfilter-includes.patch
Modified:
kernel-headers/trunk/PKGBUILD
Deleted:
kernel-headers/trunk/if_addrlabel.h.patch
--------------------------+
PKGBUILD | 9 ++--
if_addrlabel.h.patch | 25 ------------
netfilter-includes.patch | 91 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-06-22 19:48:58 UTC (rev 3464)
+++ PKGBUILD 2008-06-22 20:06:08 UTC (rev 3465)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=kernel-headers
-pkgver=2.6.25.6
+pkgver=2.6.25.8
_basever=2.6.25
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace"
@@ -10,13 +10,16 @@
url="http://www.gnu.org/software/libc"
groups=('base')
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2
- http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2)
+ http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2
+ netfilter-includes.patch)
md5sums=('db95a49a656a3247d4995a797d333153'
- '124200a50019e7da6010bf7fdd7fb5dc')
+ '007e6aca33604bc09687790361026d3c'
+ '671fa5d449e145199a871d1a41514122')
build() {
cd ${startdir}/src/linux-${_basever}
patch -Np1 -i ${startdir}/src/patch-${pkgver} || return 1
+ patch -Np1 -i ${startdir}/src/netfilter-includes.patch || return 1
make mrproper
make headers_check || return 1
Deleted: if_addrlabel.h.patch
===================================================================
--- if_addrlabel.h.patch 2008-06-22 19:48:58 UTC (rev 3464)
+++ if_addrlabel.h.patch 2008-06-22 20:06:08 UTC (rev 3465)
@@ -1,25 +0,0 @@
-From: Stephen Hemminger <stephen.hemminger at vyatta.com>
-Date: Tue, 5 Feb 2008 11:18:51 +0000 (-0800)
-Subject: [NET]: Add if_addrlabel.h to sanitized headers.
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.24.y.git;a=commitdiff_plain;h=dded91611a728d65721cdab3dd41d801a356fa15
-
-[NET]: Add if_addrlabel.h to sanitized headers.
-
-if_addrlabel.h is needed for iproute2 usage.
-
-Signed-off-by: Stephen Hemminger <stephen.hemminger at vyatta.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
----
-
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index c0f9bb7..9363122 100644
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -219,6 +219,7 @@ unifdef-y += i2c-dev.h
- unifdef-y += icmp.h
- unifdef-y += icmpv6.h
- unifdef-y += if_addr.h
-+unifdef-y += if_addrlabel.h
- unifdef-y += if_arp.h
- unifdef-y += if_bridge.h
- unifdef-y += if_ec.h
Added: netfilter-includes.patch
===================================================================
--- netfilter-includes.patch (rev 0)
+++ netfilter-includes.patch 2008-06-22 20:06:08 UTC (rev 3465)
@@ -0,0 +1,91 @@
+From: Patrick McHardy <kaber at trash.net>
+Date: Wed, 21 May 2008 21:08:38 +0000 (-0700)
+Subject: netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
+X-Git-Tag: v2.6.26-rc4~7^2~9
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
+
+netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
+
+Greg Steuck <greg at nest.cx> points out that some of the netfilter
+headers can't be used in userspace without including linux/types.h
+first. The headers include their own linux/types.h include statements,
+these are stripped by make headers-install because they are inside
+#ifdef __KERNEL__ however. Move them out to fix this.
+
+Reported and Tested by Greg Steuck.
+
+Signed-off-by: Patrick McHardy <kaber at trash.net>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index e4c6659..0c5eb7e 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,6 @@
+
+ #ifdef __KERNEL__
+ #include <linux/init.h>
+-#include <linux/types.h>
+ #include <linux/skbuff.h>
+ #include <linux/net.h>
+ #include <linux/netdevice.h>
+@@ -14,6 +13,7 @@
+ #include <linux/list.h>
+ #include <net/net_namespace.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+
+ /* Responses from hook functions. */
+diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
+index dd9c97f..590ac3d 100644
+--- a/include/linux/netfilter_arp/arp_tables.h
++++ b/include/linux/netfilter_arp/arp_tables.h
+@@ -11,11 +11,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in.h>
+ #include <linux/if_arp.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_arp.h>
+
+diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
+index bfc889f..092bd50 100644
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
+@@ -17,11 +17,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in.h>
+ #include <linux/ip.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_ipv4.h>
+
+diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
+index f2507dc..1089e33 100644
+--- a/include/linux/netfilter_ipv6/ip6_tables.h
++++ b/include/linux/netfilter_ipv6/ip6_tables.h
+@@ -17,11 +17,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in6.h>
+ #include <linux/ipv6.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_ipv6.h>
+
More information about the arch-commits
mailing list