From 7278a08f25737560c9d3ebeb8b51c040bd8df613 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 8 Apr 2014 11:58:04 +0200
Subject: fix iptables build, when conntrack lib is found, form buildroot

---
 .../patches/patch-include_libnfnetlink_libnfnetlink_h       |  6 +++---
 .../patch-include_libnfnetlink_linux_nfnetlink_compat_h     | 13 +++++++++++--
 .../patches/patch-include_libnfnetlink_linux_nfnetlink_h    | 10 +++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

(limited to 'package/libnfnetlink/patches')

diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
index 679be187d..9754ebca8 100644
--- a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
+++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h
@@ -1,10 +1,10 @@
 --- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h	2010-05-09 23:31:56.000000000 +0200
-+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h	2013-08-20 18:44:17.220339451 +0200
-@@ -15,6 +15,7 @@
++++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h	2014-04-08 08:59:56.000000000 +0200
+@@ -15,6 +15,8 @@
  #define aligned_u64 unsigned long long __attribute__((aligned(8)))
  #endif
  
-+#include <sys/types.h>
++#include <stdint.h>
  #include <sys/socket.h>	/* for sa_family_t */
  #include <linux/netlink.h>
  #include <libnfnetlink/linux_nfnetlink.h>
diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h
index 9ea8016a3..2679e67c3 100644
--- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h
+++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h
@@ -1,6 +1,15 @@
 --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink_compat.h	2008-06-18 14:36:57.000000000 +0200
-+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h	2014-04-05 09:33:12.251169468 +0200
-@@ -20,8 +20,8 @@
++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h	2014-04-08 09:00:23.000000000 +0200
+@@ -3,6 +3,8 @@
+ #ifndef __KERNEL__
+ /* Old nfnetlink macros for userspace */
+ 
++#include <stdint.h>
++
+ /* nfnetlink groups: Up to 32 maximum */
+ #define NF_NETLINK_CONNTRACK_NEW 		0x00000001
+ #define NF_NETLINK_CONNTRACK_UPDATE		0x00000002
+@@ -20,8 +22,8 @@
  
  struct nfattr
  {
diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h
index 9f89c6f55..86b231660 100644
--- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h
+++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h
@@ -1,5 +1,13 @@
 --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h	2008-06-18 14:36:57.000000000 +0200
-+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h	2014-04-05 09:34:31.863222315 +0200
++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h	2014-04-08 09:31:12.000000000 +0200
+@@ -1,6 +1,6 @@
+ #ifndef _NFNETLINK_H
+ #define _NFNETLINK_H
+-#include <linux/types.h>
++#include <stdint.h>
+ #include <libnfnetlink/linux_nfnetlink_compat.h>
+ 
+ enum nfnetlink_groups {
 @@ -25,9 +25,9 @@ enum nfnetlink_groups {
  /* General form of address family dependent message.
   */
-- 
cgit v1.2.3