/net-misc/iputils/files/iputils-20180629-fix-ping-on-musl.patch

https://gitlab.com/argent/portage · Patch · 54 lines · 46 code · 8 blank · 0 comment · 0 complexity · 5faa55419cc427700bc4b3890716bddd MD5 · raw file 

    

  1. From 25899e849aa3abc1ad29ebf0b830262a859eaed5 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Petr Vorel <petr.vorel@gmail.com>
    3. 

  3. Date: Sat, 21 Jul 2018 17:46:14 +0200
    4. 

  4. Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
    5. 

  5. 

  6. Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
    7. 

  7. systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
    8. 

  8. alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
    9. 

  9. uClibc-ng 1.0.30) when not using the system libidn2.
    10. 

  10. 

  11. Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
    12. 

  12. 

  13. Reported-by: Nicholas Fish
    14. 

  14. Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
    15. 

  15. ---
    16. 

  16.  ping.c | 2 +-
    17. 

  17.  ping.h | 2 +-
    18. 

  18.  2 files changed, 2 insertions(+), 2 deletions(-)
    19. 

  19. 

  20. diff --git a/ping.c b/ping.c
    21. 

  21. index 733477f..b241815 100644
    22. 

  22. --- a/ping.c
    23. 

  23. +++ b/ping.c
    24. 

  24. @@ -207,9 +207,9 @@ main(int argc, char **argv)
    25. 

  25.  
    26. 

  26.  #ifdef USE_IDN
    27. 

  27.  	setlocale(LC_ALL, "");
    28. 

  28. -#endif
    29. 

  29.  	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
    30. 

  30.  		hints.ai_flags &= ~ AI_CANONIDN;
    31. 

  31. +#endif
    32. 

  32.  
    33. 

  33.  	/* Support being called using `ping4` or `ping6` symlinks */
    34. 

  34.  	if (argv[0][strlen(argv[0])-1] == '4')
    35. 

  35. diff --git a/ping.h b/ping.h
    36. 

  36. index 3e09685..8a0c4ef 100644
    37. 

  37. --- a/ping.h
    38. 

  38. +++ b/ping.h
    39. 

  39. @@ -28,7 +28,6 @@
    40. 

  40.  #include <netinet/icmp6.h>
    41. 

  41.  #include <linux/filter.h>
    42. 

  42.  #include <resolv.h>
    43. 

  43. -#include <locale.h>
    44. 

  44.  
    45. 

  45.  #ifdef CAPABILITIES
    46. 

  46.  #include <sys/prctl.h>
    47. 

  47. @@ -36,6 +35,7 @@
    48. 

  48.  #endif
    49. 

  49.  
    50. 

  50.  #ifdef USE_IDN
    51. 

  51. +#include <locale.h>
    52. 

  52.  #include <idn2.h>
    53. 

  53.  #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
    54. 

  54.  #define getnameinfo_flags NI_IDN
    55.