From ea075aad73b5302841afe0c1a8c470261d3d0fcf Mon Sep 17 00:00:00 2001
From: Nicholas Fish <gentoo@seaofdirac.net>
Date: Sat, 21 Jul 2018 22:26:20 +0200
Subject: net-misc/iputils: Update patch to address missing IDN support per
 upstream

---
 net-misc/iputils/Manifest                          |  2 +-
 .../iputils-20180629-exclude-ai_canonidn.patch     | 43 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 433b499..a35c676 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,5 +1,5 @@
 AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
-AUX iputils-20180629-exclude-ai_canonidn.patch 683 BLAKE2B 300cddddc206a437e0b8127030c728e788519d82be3cc7ea30967499d0ed2c0f33251191e9ae0bf9d8c778660873a4706c824d161a35731d53e78322090ce577 SHA512 6ef326aebdb8b59380a99d568172c74c9d1e2ca7a469d5a0feab26b5980503fbae9c573e1ee6ed6c70b4d32a1022b7dc2638ba02499d01863ff64146b014cad5
+AUX iputils-20180629-exclude-ai_canonidn.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df
 AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d
 AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54
 AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443
diff --git a/net-misc/iputils/files/iputils-20180629-exclude-ai_canonidn.patch b/net-misc/iputils/files/iputils-20180629-exclude-ai_canonidn.patch
index e27171f..8d8160a 100644
--- a/net-misc/iputils/files/iputils-20180629-exclude-ai_canonidn.patch
+++ b/net-misc/iputils/files/iputils-20180629-exclude-ai_canonidn.patch
@@ -1,11 +1,21 @@
-From 4f74c44f0b3cf992e364b2776367ba91c9d13599 Mon Sep 17 00:00:00 2001
-From: Nicholas Fish <github@seaofdirac.net>
-Date: Sat, 21 Jul 2018 16:42:46 +0200
-Subject: [PATCH] Fix compilation on systems that don't yet support IDN
+From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel@gmail.com>
+Date: Sat, 21 Jul 2018 17:46:14 +0200
+Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
 
+Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
+systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
+alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
+uClibc-ng 1.0.30) when not using the system libidn2.
+
+Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
+
+Reported-by: Nicholas Fish
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
 ---
  ping.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ ping.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/ping.c b/ping.c
 index 733477f..b241815 100644
@@ -22,6 +32,23 @@ index 733477f..b241815 100644
  
  	/* Support being called using `ping4` or `ping6` symlinks */
  	if (argv[0][strlen(argv[0])-1] == '4')
--- 
-2.18.0
-
+diff --git a/ping.h b/ping.h
+index 3e09685..8a0c4ef 100644
+--- a/ping.h
++++ b/ping.h
+@@ -28,7 +28,6 @@
+ #include <netinet/icmp6.h>
+ #include <linux/filter.h>
+ #include <resolv.h>
+-#include <locale.h>
+ 
+ #ifdef CAPABILITIES
+ #include <sys/prctl.h>
+@@ -36,6 +35,7 @@
+ #endif
+ 
+ #ifdef USE_IDN
++#include <locale.h>
+ #include <idn2.h>
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
-- 
cgit v1.2.3-65-gdbad