gentoo resync : 31.10.2017

4 files changed, 101 insertions, 5 deletions

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 98544fe1b5cd..226cff659b88 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,6 +11,7 @@ AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb
 AUX iputils-20121221-tftpd-setid.patch 815 SHA256 8b1351b43b69a9147b93a0744e57d2634c1fd2abf99856a7447d633bde9cbce4 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123 WHIRLPOOL df55138a63fb1b1998e5957eb33f8dfd008dbf9d0701f89dc1bb56a9841b4b9e66ec8d76b83652409655e9b4a953f858eec005fe19463283437a2e477f4ac448
 AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
+AUX iputils-99999999-musl.patch 1799 SHA256 56bd6ade67b3625e0363a62146a5321669f82781b07c6702e2e72ba60d0664d1 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54 WHIRLPOOL 9ef98966ee94abf2eb7a353d4396ae87472aa01caacd509ef16cf0480bc87dafc2c849688b45ba172e52a50a000d270be19eff175b9a14c8fe97654267259b2f
 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
@@ -31,8 +32,8 @@ EBUILD iputils-20121221-r2.ebuild 4051 SHA256 0a64b2b06d19398aeb897343331a6726c1
 EBUILD iputils-20151218.ebuild 3977 SHA256 9624dd416733b58c1a9815304144fbcb0de07940dc6e471ea9e8f26555660752 SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0 WHIRLPOOL 7b34b8d257060570c7d837c6ed055e7e2c5a56c312b3e9ff00254268ec52bdf77511dd7fee0501f2a39dd11d3c12df67331c901655491165c9bd8104fa36a701
 EBUILD iputils-20160308.ebuild 3838 SHA256 7d5e1ea302cb909cad75f3caae438cec9c7b9d98170a13972d9d284da363fb5b SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08 WHIRLPOOL 39f3b25e0ebbde84a1935aced624b3c4004c40d992bb84542cd214003fdd2d6169a0c5374a11e8116177d4fd9b27ac0437547b3fc1ab9fcf2b2b9a411730bc20
 EBUILD iputils-20161105.ebuild 3870 SHA256 2a735d03e5d5e68917eff814f785ece65814b796ad7c82fb995bb0510fb05fd2 SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611 WHIRLPOOL 0ce5472affdeec7294d315f446bb4ea44cb645c11af82a6e2b9278d4b5cbe41162eb2c98d36bf8e325153c8c390b17f7fc65f9cec2a54e11b3d95d8458c071a1
-EBUILD iputils-20171016_pre.ebuild 4047 SHA256 f59e918116747eb88f5302d8114cdda78298ea6b871aa4a30d533c9ca40abba3 SHA512 3880b66f83d0fd16264d33bdf921a20dbfeb36aba0e0bfb4f66edf7263f2073d1b11b640c767fff7e2b942e579b169a84635fc39d663b7dfc23391e7a9fbb3dd WHIRLPOOL 4e82c0eda67cf89c736f90e91404cb7ea131ab6e15bd1911a65883adc737c0a2ca1d3ade2772fbedeb2693d91358f8b2ce182cb198456b24202e1fde6bdef930
-EBUILD iputils-99999999.ebuild 3952 SHA256 83b873e1928ceeb5395b548036eb45fe69bcc32408f30b2e6dbc036a6d35fe5f SHA512 6a8b9785e417e02b7bc197971e83a7f548e5881a13308ffdb91dbb0f57931eb602761d9282323700272e03ff1f622af2fca4cda8553fc65b4f864bad81af91de WHIRLPOOL 682db8620f2543227d73c87c3c8800f4c46cdfaec91275e16af1bb777e9042af5c6686b460b30b1d04498b7ef20c11667ba1b128fac7fc34d0f88fc293c9ff41
+EBUILD iputils-20171016_pre.ebuild 4089 SHA256 b07ead8924f0dc5f46e04e58dc4c56c49f3fb5e8a00ddd94a5ea344983f596bc SHA512 41b570b7aca636f33fc434cb6ec93f7ab9022398dec0562b20b9b82cff0bda52066e58cb55f3c0d68ab54de78ee2354e35e3ac9d4c1e3403726ae3c0997a52e3 WHIRLPOOL 803246123babe8e70e2e3a5cfea6d51174364c3fd689f58f90fd975cd50654f4ffc7eedfb25714caecdbb88bc3b6290067f54441b8981e759fe203b820d392fe
+EBUILD iputils-99999999.ebuild 3905 SHA256 00dd0fb54899b4d7c906fc560c687896808fa648c2414b0862365cd06eede7b5 SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437 WHIRLPOOL a62f4a3a8bd77c8c3d2e8bddb381557ccf7094e47e66b2d583f406191cef15e3528360cf66378b66cb86f08cf8657a4b519952e379ac6ec1deca89c7f1b3805b
 MISC ChangeLog 9602 SHA256 b860b10f98c5ce47173ef3e78599cc524579114a8fcfb2a0ea4e3938cc42244e SHA512 7824d23cb1249c0008aa507cea0d30be9d2dcce0053bf1a20a12df3527357530120c9559c7f4ac353e880ca1c3d07c4c56a29301e59ed43ca3a5362e552f7015 WHIRLPOOL 63cde37c69f443e03196145b99456ebf254d766988272002c38484e1139bf42efd57b7d976ce2064a41398346fe67d3a27b275ec84a998f300422b528782d2a9
 MISC ChangeLog-2015 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade
 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch
new file mode 100644
index 000000000000..167e7fabca70
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-musl.patch
@@ -0,0 +1,92 @@
+From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001
+From: Aric Belsito <lluixhi@gmail.com>
+Date: Sun, 29 Oct 2017 23:17:03 +0100
+Subject: [PATCH] Fix build on MUSL
+
+Add missing AI_IDN and NI_IDN declarations.
+
+Bug: https://bugs.gentoo.org/503914
+---
+ arping.c      |  7 +++++++
+ ping.h        | 11 +++++++++++
+ tracepath.c   |  8 ++++++++
+ traceroute6.c |  4 ++++
+ 4 files changed, 30 insertions(+)
+
+diff --git a/arping.c b/arping.c
+index 0ac18cd..5d2145e 100644
+--- a/arping.c
++++ b/arping.c
+@@ -45,6 +45,13 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
+ #endif
+ 
+ #include "SNAPSHOT.h"
+diff --git a/ping.h b/ping.h
+index c5f0321..0391de0 100644
+--- a/ping.h
++++ b/ping.h
+@@ -38,6 +38,17 @@
+ #include <locale.h>
+ #include <idna.h>
+ #include <stringprep.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
+ #else
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..c50e3ec 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -30,6 +30,14 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+diff --git a/traceroute6.c b/traceroute6.c
+index 7807956..c6d868a 100644
+--- a/traceroute6.c
++++ b/traceroute6.c
+@@ -247,6 +247,10 @@
+ #include <idna.h>
+ #include <locale.h>
+ 
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+-- 
+2.14.3
+
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index 691040d27e10..fb555325457d 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -13,7 +13,10 @@ inherit flag-o-matic toolchain-funcs fcaps
 
 MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
 
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-tracepath46.patch
+	"${FILESDIR}"/${PN}-99999999-musl.patch
+)
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 9731575e02e3..84d809667e59 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -11,7 +11,7 @@ EAPI="6"
 
 inherit flag-o-matic toolchain-funcs fcaps
 
-PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+PATCHES=()
 
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
+	idn? ( net-dns/libidn2[static-libs(+)] )
 	ipv6? ( ssl? (
 		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
 		nettle? ( dev-libs/nettle[static-libs(+)] )