summaryrefslogtreecommitdiffstats
path: root/abs/core/kernel-headers
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/kernel-headers')
-rw-r--r--abs/core/kernel-headers/PKGBUILD27
-rw-r--r--abs/core/kernel-headers/netfilter-includes.patch91
2 files changed, 118 insertions, 0 deletions
diff --git a/abs/core/kernel-headers/PKGBUILD b/abs/core/kernel-headers/PKGBUILD
new file mode 100644
index 0000000..485a918
--- /dev/null
+++ b/abs/core/kernel-headers/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 3465 2008-06-22 20:06:08Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+pkgname=kernel-headers
+pkgver=2.6.25.8
+_basever=2.6.25
+pkgrel=10
+pkgdesc="Kernel headers sanitized for use in userspace"
+arch=('i686' 'x86_64')
+license=('GPL')
+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
+ netfilter-includes.patch)
+md5sums=('db95a49a656a3247d4995a797d333153'
+ '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
+ make INSTALL_HDR_PATH=${startdir}/pkg/usr headers_install
+}
diff --git a/abs/core/kernel-headers/netfilter-includes.patch b/abs/core/kernel-headers/netfilter-includes.patch
new file mode 100644
index 0000000..b39a4dd
--- /dev/null
+++ b/abs/core/kernel-headers/netfilter-includes.patch
@@ -0,0 +1,91 @@
+From: Patrick McHardy <kaber@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@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@trash.net>
+Signed-off-by: David S. Miller <davem@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>
+