summaryrefslogtreecommitdiffstats
path: root/package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2017-09-13 12:56:52 +0200
committerPeter Korsgaard <peter@korsgaard.com>2017-09-22 23:23:49 +0200
commit2a582cd3ca6389027c1b429c002a9769d3df026c (patch)
treecc88d6ead26dba04f628fa6867e497ddfeb937f7 /package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch
parent0919da66b495ec21a953c1bd82cc9779fa1f37eb (diff)
downloadbuildroot-2a582cd3ca6389027c1b429c002a9769d3df026c.tar.gz
buildroot-2a582cd3ca6389027c1b429c002a9769d3df026c.zip
package/net-tools: bump version
Removed patch, not needed anymore after upstream commits https://sourceforge.net/p/net-tools/code/ci/ea3935bd7c0f36c86c40e5785326698fa3336c6a/ https://sourceforge.net/p/net-tools/code/ci/45d573a89386c934d3ebac499d00c1670437813b/ Added sha256 hash. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch')
-rw-r--r--package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch72
1 files changed, 0 insertions, 72 deletions
diff --git a/package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch b/package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch
deleted file mode 100644
index a8658c4fec..0000000000
--- a/package/net-tools/0001-iptunnel.c-do-not-include-netinet-ip.h.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From eec38a200357b195efbb23bb645ab721c040f246 Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Thu, 3 Nov 2016 12:59:39 +0000
-Subject: [PATCH] iptunnel.c: do not include netinet/ip.h
-
-This fixes a struct redefinition problem like this one:
-
-================================
-In file included from /usr/include/linux/if_tunnel.h:6:0,
- from iptunnel.c:34:
-/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr'
- struct iphdr {
- ^
-In file included from iptunnel.c:29:0:
-/usr/include/netinet/ip.h:45:8: note: originally defined here
- struct iphdr
- ^
-================================
-
-iptunnel.c includes netinet/ip.h which contains a definition of the
-iphdr struct.
-
-iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h
-which contains a definition of the iphdr struct.
-
-So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both
-of them have been included directly or indirectly by iptunnel.c. Because
-of that the compilation fails due to a struct redefinition.
-
-The problem can be solved by just not including netinet/ip.h.
-
-However, some Linux headers included in certain toolchains may not have
-an updated linux/if_tunnel.h which includes linux/ip.h, so we need to
-include it unconditionally otherwise linux/if_tunnel.h will use the
-struct iphdr before being defined and the compilation will also fail in
-this way:
-
-================================
-In file included from iptunnel.c:33:0:
-/usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type
- struct iphdr iph;
- ^
-================================
-
-Upstream status: merge request sent
-https://sourceforge.net/p/net-tools/code/merge-requests/4/
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- iptunnel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iptunnel.c b/iptunnel.c
-index 3fe1b84..e2ec2d8 100644
---- a/iptunnel.c
-+++ b/iptunnel.c
-@@ -26,11 +26,11 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <netinet/in.h>
--#include <netinet/ip.h>
- #include <arpa/inet.h>
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <linux/types.h>
-+#include <linux/ip.h>
- #include <linux/if_tunnel.h>
-
- #include "config.h"
---
-2.10.1
-
OpenPOWER on IntegriCloud