sys-apps/net-tools: sync with upstream

appease repoman

4 files changed, 39 insertions, 4 deletions

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 35ba16ea..4cf5e36e 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,4 +1,5 @@
+AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 947 SHA256 82c038f251a5bec7c5f3b22026b968dcaea396c7599c8a847b5d79f08f6dfe38 SHA512 a334bdac0dd86d94c1db9b841db3742df72d0d69d45f618b867839b0d2c99ade47b74e98f423e574af053de7a8478f04b77282ba04f437b5a9e271ea77878c50 WHIRLPOOL f4372049a06740e7054d55000bcbf5d765c8576c33d730e2a8277175e40d7f681fc82f83cbf17d95a27ed9fc4a23f4d4be1c32db0495f3b8970d5a6dc2240e0d
 AUX net-tools-fix-headers.patch 462 SHA256 e010c3fba22db3b040f5b68b791ecc3ee4892702650b1a5737a3ad6a67a2d247 SHA512 e4bf76c0f3988445d2d7bb49c8ae2aaf24d066b1060806e38c5d2764dbbe5141de58dc0d58fe34894bcde987b758178dfcff5334fcc2dabc8ec019753e931f16 WHIRLPOOL 26325db6f3d36a59f6bdee72781d19bde51c832b5d892f75ba1df77aae14beed7f4c99d4070f43af6a92e288ee070c92ef4cca11290294539d113d2f00b59b5e
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
-EBUILD net-tools-1.60_p20161110235919.ebuild 2488 SHA256 d45e6cb73dd928791c314f7f59636b215df3a87a8bce1756893717b039a485a5 SHA512 553802110461a53a7fd63d53fe11e5317f8617d68a96d77abc77a231e527239a1a2ff3729e8dc13e66797b97dc6482b106ab2ee5eca31bdbb9a8cb231966261f WHIRLPOOL f73005497bc1e1c257bd9166cdfeb0d76391f21ce6287e7308d6e804d537941e86a1a8a69a638786c1210fa50907b618cdafa52a76eb82b0ea890b7acb6d7396
-MISC metadata.xml 793 SHA256 2a9d27804bddb600311bd8d4edf07afaacac012b6a7a793169ed5bd483573b28 SHA512 f253af424192fc88818ddf125a7f2b6bc6ababe6bdd875db0fad0779aaae31a02062cc12788074ec1bf4063cdd20c15ca3f1a464af8b1f18f0b708672575e9ea WHIRLPOOL 8decaf2b8727ce6f5499c818f254db3b8291b04e73774d2b706179bb9fc39d9fdeb2b49c4e3d0e4afdcd32e3a0195ebceffe1b3d51dd894d50bf07828b6990b6
+EBUILD net-tools-1.60_p20161110235919.ebuild 2625 SHA256 3b66724157da9f8841e011863d3d71586b4988a4871d832f25ca4e40e36e9f0f SHA512 06bf7af9d22c18a88fc055ddcc86204236eef810888b6dae2d526e13daa6405d985f4b1a654a9e209920cc12841dac5be35040001f5d4d786fd3572fb042faef WHIRLPOOL 57dccddbe0e3f965b92feefac47b54a9e77fef03c7e7bf2aed6d1149561df12b4cf8b485b2df93d20e87ef5eaf2adc0db68bba4c9784f7cdd466e43e03a1f288
+MISC metadata.xml 687 SHA256 45ba9bb6b36c67c8defd1fb62b6a72c6a173c4aa37ccbbb391e161580bf7a938 SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 WHIRLPOOL 90a45c8083bc23d64ab3f3f3d4799803952c40b49cd27d965ee2be9c08df3debd42adcc090ec8e810953ac47f14eeeb3b96176c2a09d0cd72158e14c05ef0640
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 00000000..01099405
--- /dev/null
+++ b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch
@@ -0,0 +1,32 @@
+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,6 +29,11 @@
+ #include <arpa/inet.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/metadata.xml b/sys-apps/net-tools/metadata.xml
index d539cc54..53358307 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
 	<flag name="hostname">build the hostname and dnsdomainname tools</flag>
-	<flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag>
 	<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag>
 	<flag name="slattach">build the slattach tool (for working with old serial ports)</flag>
 </use>
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 80c8e9d7..fea4979a 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -64,9 +63,13 @@ set_opt() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-fix-headers.patch
+	epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch"
 }
 
 src_configure() {
+	# Clear out env vars from the user. #599602
+	unset BASEDIR BINDIR SBINDIR
+
 	set_opt I18N use nls
 	set_opt HAVE_AFINET6 use ipv6
 	set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'