/net-misc/iputils/files/iputils-20180629-musl.patch

https://gitlab.com/argent/portage · Patch · 87 lines · 78 code · 9 blank · 0 comment · 0 complexity · e960b253d4396327584d40a75a14d22f MD5 · raw file 

    

  1. commit 5007d7067918fb3d950d34c01d059e5222db679a
    2. 

  2. Author:     Aric Belsito <lluixhi@gmail.com>
    3. 

  3. AuthorDate: Mon Dec 4 00:10:29 2017 +0100
    4. 

  4. Commit:     Thomas Deutschmann <whissi@gentoo.org>
    5. 

  5. CommitDate: Wed Jul 11 01:33:28 2018 +0200
    6. 

  6. 

  7.     Fix build on MUSL
    8. 

  8.     
    9. 

  9.     Add missing AI_IDN and NI_IDN declarations.
    10. 

  10.     
    11. 

  11.     Bug: https://bugs.gentoo.org/503914
    12. 

  12.     Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
    13. 

  13. 

  14. diff --git a/arping.c b/arping.c
    15. 

  15. index c2f2129..d753345 100644
    16. 

  16. --- a/arping.c
    17. 

  17. +++ b/arping.c
    18. 

  18. @@ -44,6 +44,13 @@
    19. 

  19.  
    20. 

  20.  #ifdef USE_IDN
    21. 

  21.  #include <locale.h>
    22. 

  22. +
    23. 

  23. +#ifndef AI_IDN
    24. 

  24. +#define AI_IDN 0x0040
    25. 

  25. +#endif
    26. 

  26. +#ifndef AI_CANONIDN
    27. 

  27. +#define AI_CANONIDN 0x0080
    28. 

  28. +#endif
    29. 

  29.  #endif
    30. 

  30.  
    31. 

  31.  #include "SNAPSHOT.h"
    32. 

  32. diff --git a/ping.h b/ping.h
    33. 

  33. index 3e09685..1e51c67 100644
    34. 

  34. --- a/ping.h
    35. 

  35. +++ b/ping.h
    36. 

  36. @@ -37,6 +37,17 @@
    37. 

  37.  
    38. 

  38.  #ifdef USE_IDN
    39. 

  39.  #include <idn2.h>
    40. 

  40. +
    41. 

  41. +#ifndef AI_IDN
    42. 

  42. +#define AI_IDN 0x0040
    43. 

  43. +#endif
    44. 

  44. +#ifndef AI_CANONIDN
    45. 

  45. +#define AI_CANONIDN 0x0080
    46. 

  46. +#endif
    47. 

  47. +#ifndef NI_IDN
    48. 

  48. +#define NI_IDN 32
    49. 

  49. +#endif
    50. 

  50. +
    51. 

  51.  #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
    52. 

  52.  #define getnameinfo_flags NI_IDN
    53. 

  53.  #else
    54. 

  54. diff --git a/tracepath.c b/tracepath.c
    55. 

  55. index 53bda16..9558e49 100644
    56. 

  56. --- a/tracepath.c
    57. 

  57. +++ b/tracepath.c
    58. 

  58. @@ -29,6 +29,14 @@
    59. 

  59.  
    60. 

  60.  #ifdef USE_IDN
    61. 

  61.  #include <locale.h>
    62. 

  62. +
    63. 

  63. +#ifndef AI_IDN
    64. 

  64. +#define AI_IDN 0x0040
    65. 

  65. +#endif
    66. 

  66. +#ifndef NI_IDN
    67. 

  67. +#define NI_IDN 32
    68. 

  68. +#endif
    69. 

  69. +
    70. 

  70.  #define getnameinfo_flags	NI_IDN
    71. 

  71.  #else
    72. 

  72.  #define getnameinfo_flags	0
    73. 

  73. diff --git a/traceroute6.c b/traceroute6.c
    74. 

  74. index a1022f9..ab34615 100644
    75. 

  75. --- a/traceroute6.c
    76. 

  76. +++ b/traceroute6.c
    77. 

  77. @@ -246,6 +246,10 @@
    78. 

  78.  #ifdef USE_IDN
    79. 

  79.  #include <locale.h>
    80. 

  80.  
    81. 

  81. +#ifndef NI_IDN
    82. 

  82. +#define NI_IDN 32
    83. 

  83. +#endif
    84. 

  84. +
    85. 

  85.  #define ADDRINFO_IDN_FLAGS	AI_IDN
    86. 

  86.  #define getnameinfo_flags	NI_IDN
    87. 

  87.  #else
    88.