| 1 |
commit: 230c0365e3a9de3c6d792e66fc60391425d7c6ec |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 2 18:21:09 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Mar 2 18:40:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=230c0365 |
| 7 |
|
| 8 |
sys-apps/net-tools: sync with upstream |
| 9 |
|
| 10 |
appease repoman |
| 11 |
|
| 12 |
sys-apps/net-tools/Manifest | 5 ++-- |
| 13 |
...235919-fix-building-w-older-linux-headers.patch | 32 ++++++++++++++++++++++ |
| 14 |
sys-apps/net-tools/metadata.xml | 1 - |
| 15 |
.../net-tools-1.60_p20161110235919.ebuild | 5 +++- |
| 16 |
4 files changed, 39 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest |
| 19 |
index 35ba16e..4cf5e36 100644 |
| 20 |
--- a/sys-apps/net-tools/Manifest |
| 21 |
+++ b/sys-apps/net-tools/Manifest |
| 22 |
@@ -1,4 +1,5 @@ |
| 23 |
+AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 947 SHA256 82c038f251a5bec7c5f3b22026b968dcaea396c7599c8a847b5d79f08f6dfe38 SHA512 a334bdac0dd86d94c1db9b841db3742df72d0d69d45f618b867839b0d2c99ade47b74e98f423e574af053de7a8478f04b77282ba04f437b5a9e271ea77878c50 WHIRLPOOL f4372049a06740e7054d55000bcbf5d765c8576c33d730e2a8277175e40d7f681fc82f83cbf17d95a27ed9fc4a23f4d4be1c32db0495f3b8970d5a6dc2240e0d |
| 24 |
AUX net-tools-fix-headers.patch 462 SHA256 e010c3fba22db3b040f5b68b791ecc3ee4892702650b1a5737a3ad6a67a2d247 SHA512 e4bf76c0f3988445d2d7bb49c8ae2aaf24d066b1060806e38c5d2764dbbe5141de58dc0d58fe34894bcde987b758178dfcff5334fcc2dabc8ec019753e931f16 WHIRLPOOL 26325db6f3d36a59f6bdee72781d19bde51c832b5d892f75ba1df77aae14beed7f4c99d4070f43af6a92e288ee070c92ef4cca11290294539d113d2f00b59b5e |
| 25 |
DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070 |
| 26 |
-EBUILD net-tools-1.60_p20161110235919.ebuild 2488 SHA256 d45e6cb73dd928791c314f7f59636b215df3a87a8bce1756893717b039a485a5 SHA512 553802110461a53a7fd63d53fe11e5317f8617d68a96d77abc77a231e527239a1a2ff3729e8dc13e66797b97dc6482b106ab2ee5eca31bdbb9a8cb231966261f WHIRLPOOL f73005497bc1e1c257bd9166cdfeb0d76391f21ce6287e7308d6e804d537941e86a1a8a69a638786c1210fa50907b618cdafa52a76eb82b0ea890b7acb6d7396 |
| 27 |
-MISC metadata.xml 793 SHA256 2a9d27804bddb600311bd8d4edf07afaacac012b6a7a793169ed5bd483573b28 SHA512 f253af424192fc88818ddf125a7f2b6bc6ababe6bdd875db0fad0779aaae31a02062cc12788074ec1bf4063cdd20c15ca3f1a464af8b1f18f0b708672575e9ea WHIRLPOOL 8decaf2b8727ce6f5499c818f254db3b8291b04e73774d2b706179bb9fc39d9fdeb2b49c4e3d0e4afdcd32e3a0195ebceffe1b3d51dd894d50bf07828b6990b6 |
| 28 |
+EBUILD net-tools-1.60_p20161110235919.ebuild 2625 SHA256 3b66724157da9f8841e011863d3d71586b4988a4871d832f25ca4e40e36e9f0f SHA512 06bf7af9d22c18a88fc055ddcc86204236eef810888b6dae2d526e13daa6405d985f4b1a654a9e209920cc12841dac5be35040001f5d4d786fd3572fb042faef WHIRLPOOL 57dccddbe0e3f965b92feefac47b54a9e77fef03c7e7bf2aed6d1149561df12b4cf8b485b2df93d20e87ef5eaf2adc0db68bba4c9784f7cdd466e43e03a1f288 |
| 29 |
+MISC metadata.xml 687 SHA256 45ba9bb6b36c67c8defd1fb62b6a72c6a173c4aa37ccbbb391e161580bf7a938 SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 WHIRLPOOL 90a45c8083bc23d64ab3f3f3d4799803952c40b49cd27d965ee2be9c08df3debd42adcc090ec8e810953ac47f14eeeb3b96176c2a09d0cd72158e14c05ef0640 |
| 30 |
|
| 31 |
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 |
| 32 |
new file mode 100644 |
| 33 |
index 0000000..0109940 |
| 34 |
--- /dev/null |
| 35 |
+++ b/sys-apps/net-tools/files/net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch |
| 36 |
@@ -0,0 +1,32 @@ |
| 37 |
+From ea3935bd7c0f36c86c40e5785326698fa3336c6a Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Mike Frysinger <vapier@g.o> |
| 39 |
+Date: Mon, 14 Nov 2016 22:48:42 -0500 |
| 40 |
+Subject: [PATCH] iptunnel: fix building w/older linux headers |
| 41 |
+ |
| 42 |
+While linux-4.8+ headers work, older ones are missing includes. |
| 43 |
+Dropping netinet/ip.h uncovered that mess, so add linux/ip.h. |
| 44 |
+ |
| 45 |
+URL: https://bugs.gentoo.org/599542 |
| 46 |
+Reported-by: Conrad Kostecki <ck@××××××××.de> |
| 47 |
+--- |
| 48 |
+ iptunnel.c | 5 +++++ |
| 49 |
+ 1 file changed, 5 insertions(+) |
| 50 |
+ |
| 51 |
+diff --git a/iptunnel.c b/iptunnel.c |
| 52 |
+index 247ae10..d6e47e6 100644 |
| 53 |
+--- a/iptunnel.c |
| 54 |
++++ b/iptunnel.c |
| 55 |
+@@ -29,6 +29,11 @@ |
| 56 |
+ #include <arpa/inet.h> |
| 57 |
+ #include <net/if_arp.h> |
| 58 |
++/* We only care about linux/if_tunnel.h. Unfortunately, older Linux headers |
| 59 |
++ * (pre linux-4.8) did not include all the proper headers leading to missing |
| 60 |
++ * structs and types. |
| 61 |
++ */ |
| 62 |
+ #include <linux/types.h> |
| 63 |
++#include <linux/ip.h> |
| 64 |
+ #include <linux/if_tunnel.h> |
| 65 |
+ |
| 66 |
+ #include "config.h" |
| 67 |
+-- |
| 68 |
+2.9.0 |
| 69 |
|
| 70 |
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml |
| 71 |
index d539cc5..5335830 100644 |
| 72 |
--- a/sys-apps/net-tools/metadata.xml |
| 73 |
+++ b/sys-apps/net-tools/metadata.xml |
| 74 |
@@ -8,7 +8,6 @@ |
| 75 |
<use> |
| 76 |
<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag> |
| 77 |
<flag name="hostname">build the hostname and dnsdomainname tools</flag> |
| 78 |
- <flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag> |
| 79 |
<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag> |
| 80 |
<flag name="slattach">build the slattach tool (for working with old serial ports)</flag> |
| 81 |
</use> |
| 82 |
|
| 83 |
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild |
| 84 |
index 80c8e9d..fea4979 100644 |
| 85 |
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild |
| 86 |
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild |
| 87 |
@@ -1,6 +1,5 @@ |
| 88 |
# Copyright 1999-2016 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
-# $Id$ |
| 91 |
|
| 92 |
EAPI="5" |
| 93 |
|
| 94 |
@@ -64,9 +63,13 @@ set_opt() { |
| 95 |
|
| 96 |
src_prepare() { |
| 97 |
epatch "${FILESDIR}"/${PN}-fix-headers.patch |
| 98 |
+ epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch" |
| 99 |
} |
| 100 |
|
| 101 |
src_configure() { |
| 102 |
+ # Clear out env vars from the user. #599602 |
| 103 |
+ unset BASEDIR BINDIR SBINDIR |
| 104 |
+ |
| 105 |
set_opt I18N use nls |
| 106 |
set_opt HAVE_AFINET6 use ipv6 |
| 107 |
set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' |
Archives