From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 12 Feb 2017 18:46:24 +0000 (+0100)
Subject: net-tools: fix build with kernel 4.9 headers
X-Git-Tag: v2.21-core122~178^2~169
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a58a2e67ec106b33e3de3f68e335492ecbce0bcc

net-tools: fix build with kernel 4.9 headers

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/net-tools b/lfs/net-tools
index ae4d73850e..f3ba8ecb32 100644
--- a/lfs/net-tools
+++ b/lfs/net-tools
@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-iphdr-redef.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch
 	cd $(DIR_APP) && yes "" | make config
 	cd $(DIR_APP) && sed -i	-e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \
diff --git a/src/patches/net-tools-1.60-iphdr-redef.patch b/src/patches/net-tools-1.60-iphdr-redef.patch
new file mode 100644
index 0000000000..23b6dfe013
--- /dev/null
+++ b/src/patches/net-tools-1.60-iphdr-redef.patch
@@ -0,0 +1,12 @@
+diff -Naur net-tools-1.60.org/iptunnel.c net-tools-1.60/iptunnel.c
+--- net-tools-1.60.org/iptunnel.c	2001-04-08 19:04:23.000000000 +0200
++++ net-tools-1.60/iptunnel.c	2017-02-07 17:37:17.956405434 +0100
+@@ -26,7 +26,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
++#include <linux/ip.h>
+ #include <arpa/inet.h>
+ #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+ #include <net/if.h>