diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2016-11-23 17:05:02 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2016-11-23 17:06:08 +0100 |
| commit | 4090447b0cb0064a77db6725deb8213bb5138eff (patch) | |
| tree | f68874ab6fed15d70089a93f6d877435a49846e2 /sys-apps/net-tools | |
| parent | www-misc/shellinabox: version bump. (diff) | |
| download | gentoo-4090447b0cb0064a77db6725deb8213bb5138eff.tar.gz gentoo-4090447b0cb0064a77db6725deb8213bb5138eff.tar.bz2 gentoo-4090447b0cb0064a77db6725deb8213bb5138eff.zip | |
sys-apps/net-tools: Fix building w/<linux-headers-4.8
Acked-by: Lars Wendler <polynomial-c@gentoo.org>
Gentoo-Bug: https://bugs.gentoo.org/599542
Package-Manager: portage-2.3.2
Diffstat (limited to 'sys-apps/net-tools')
| -rw-r--r-- | sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch | 33 | ||||
| -rw-r--r-- | sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild | 4 |
2 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch new file mode 100644 index 000000000000..5e330ace021c --- /dev/null +++ b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch @@ -0,0 +1,33 @@ +From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 14 Nov 2016 22:48:42 -0500 +Subject: [PATCH] iptunnel: fix building w/older linux headers + +While linux-4.8+ headers work, older ones are missing includes. +Dropping netinet/ip.h uncovered that mess, so add linux/ip.h. + +URL: https://bugs.gentoo.org/599542 +Reported-by: Conrad Kostecki <ck@bl4ckb0x.de> +--- + iptunnel.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/iptunnel.c b/iptunnel.c +index 247ae10..d6e47e6 100644 +--- a/iptunnel.c ++++ b/iptunnel.c +@@ -29,7 +29,12 @@ + #include <arpa/inet.h> + #include <net/if.h> + #include <net/if_arp.h> ++/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers ++ * (pre linux-4.8) did not include all the proper headers leading to missing ++ * structs and types. ++ */ + #include <linux/types.h> ++#include <linux/ip.h> + #include <linux/if_tunnel.h> + + #include "config.h" +-- +2.9.0 diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild index 1337b632552f..b13fa82606f2 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild +++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild @@ -62,6 +62,10 @@ set_opt() { config.in || die } +src_prepare() { + epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch" +} + src_configure() { # Clear out env vars from the user. #599602 unset BASEDIR BINDIR SBINDIR |