/net-misc/iputils/files/iputils-20070202-idn.patch

https://github.com/1000timesdead/portage · Patch · 158 lines · 141 code · 17 blank · 0 comment · 0 complexity · 8cbe39828df26a3a1dc6ac883d03b285 MD5 · raw file 

    

  1. sniped from Fedora and made to not suck
    2. 

  2. 

  3. http://bugs.gentoo.org/218638
    4. 

  4. 

  5. --- iputils-s20070202/Makefile
    6. 

  6. +++ iputils-s20070202/Makefile
    7. 

  7. @@ -22,6 +22,11 @@
    8. 

  8.  
    9. 

  9.  all: $(TARGETS)
    10. 

  10.  
    11. 

  11. +ifeq ($(IDN),yes)
    12. 

  12. +CPPFLAGS += -DIDN
    13. 

  13. +ping: LDLIBS += -lidn
    14. 

  14. +ping6: LDLIBS += -lidn
    15. 

  15. +endif
    16. 

  16.  
    17. 

  17.  tftpd: tftpd.o tftpsubs.o
    18. 

  18.  ping: ping.o ping_common.o
    19. 

  19. --- iputils-s20070202/ping.c
    20. 

  20. +++ iputils-s20070202/ping.c
    21. 

  21. @@ -58,6 +58,11 @@
    22. 

  22.   *	This program has to run SUID to ROOT to access the ICMP socket.
    23. 

  23.   */
    24. 

  24.  
    25. 

  25. +#ifdef IDN
    26. 

  26. +#include <idna.h>
    27. 

  27. +#include <locale.h>
    28. 

  28. +#endif
    29. 

  29. +
    30. 

  30.  #include "ping_common.h"
    31. 

  31.  
    32. 

  32.  #include <netinet/ip.h>
    33. 

  33. @@ -122,6 +128,12 @@
    34. 

  34.  	char *target, hnamebuf[MAXHOSTNAMELEN];
    35. 

  35.  	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
    36. 

  36.  
    37. 

  37. +#ifdef IDN
    38. 

  38. +	char *idn;
    39. 

  39. +	int rc = 0;
    40. 

  40. +	setlocale(LC_ALL, "");
    41. 

  41. +#endif
    42. 

  42. +
    43. 

  43.  	icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
    44. 

  44.  	socket_errno = errno;
    45. 

  45.  
    46. 

  46. @@ -242,13 +254,35 @@
    47. 

  47.  			if (argc == 1)
    48. 

  48.  				options |= F_NUMERIC;
    49. 

  49.  		} else {
    50. 

  50. +#ifdef IDN
    51. 

  51. +			rc = idna_to_ascii_lz (target, &idn, 0);
    52. 

  52. +			if (rc == IDNA_SUCCESS)
    53. 

  53. +				hp = gethostbyname (idn);
    54. 

  54. +			else {
    55. 

  55. +				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
    56. 

  56. +				exit(2);
    57. 

  57. +			}
    58. 

  58. +			free(idn);
    59. 

  59. +#else
    60. 

  60.  			hp = gethostbyname(target);
    61. 

  61. +#endif
    62. 

  62.  			if (!hp) {
    63. 

  63.  				fprintf(stderr, "ping: unknown host %s\n", target);
    64. 

  64.  				exit(2);
    65. 

  65.  			}
    66. 

  66.  			memcpy(&whereto.sin_addr, hp->h_addr, 4);
    67. 

  67. +#ifdef IDN
    68. 

  68. +			rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
    69. 

  69. +			if (rc == IDNA_SUCCESS)
    70. 

  70. +				strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
    71. 

  71. +			else {
    72. 

  72. +				fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc);
    73. 

  73. +				exit(2);
    74. 

  74. +			}
    75. 

  75. +			free(idn);
    76. 

  76. +#else
    77. 

  77.  			strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
    78. 

  78. +#endif
    79. 

  79.  			hnamebuf[sizeof(hnamebuf) - 1] = 0;
    80. 

  80.  			hostname = hnamebuf;
    81. 

  81.  		}
    82. 

  82. --- iputils-s20070202/ping6.c
    83. 

  83. +++ iputils-s20070202/ping6.c
    84. 

  84. @@ -66,6 +66,13 @@
    85. 

  85.   *	More statistics could always be gathered.
    86. 

  86.   *	This program has to run SUID to ROOT to access the ICMP socket.
    87. 

  87.   */
    88. 

  88. +#ifdef IDN
    89. 

  89. +#ifndef _GNU_SOURCE
    90. 

  90. +#define _GNU_SOURCE
    91. 

  91. +#endif
    92. 

  92. +#include <locale.h>
    93. 

  93. +#endif
    94. 

  94. +
    95. 

  95.  #include "ping_common.h"
    96. 

  96.  
    97. 

  97.  #include <linux/filter.h>
    98. 

  98. @@ -210,6 +216,10 @@
    99. 

  99.  	int err, csum_offset, sz_opt;
    100. 

  100.  	static uint32_t scope_id = 0;
    101. 

  101.  
    102. 

  102. +#ifdef IDN
    103. 

  103. +	setlocale(LC_ALL, "");
    104. 

  104. +#endif
    105. 

  105. +
    106. 

  106.  	icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
    107. 

  107.  	socket_errno = errno;
    108. 

  108.  
    109. 

  109. @@ -296,6 +306,9 @@
    110. 

  110.  
    111. 

  111.  		memset(&hints, 0, sizeof(hints));
    112. 

  112.  		hints.ai_family = AF_INET6;
    113. 

  113. +#ifdef IDN
    114. 

  114. +		hints.ai_flags = AI_IDN;
    115. 

  115. +#endif
    116. 

  116.  		gai = getaddrinfo(target, NULL, &hints, &ai);
    117. 

  117.  		if (gai) {
    118. 

  118.  			fprintf(stderr, "unknown host\n");
    119. 

  119. @@ -328,6 +341,9 @@
    120. 

  120.  
    121. 

  121.  	memset(&hints, 0, sizeof(hints));
    122. 

  122.  	hints.ai_family = AF_INET6;
    123. 

  123. +#ifdef IDN
    124. 

  124. +	hints.ai_flags = AI_IDN;
    125. 

  125. +#endif
    126. 

  126.  	gai = getaddrinfo(target, NULL, &hints, &ai);
    127. 

  127.  	if (gai) {
    128. 

  128.  		fprintf(stderr, "unknown host\n");
    129. 

  129. --- iputils-s20070202/ping_common.c
    130. 

  130. +++ iputils-s20070202/ping_common.c
    131. 

  131. @@ -1,3 +1,7 @@
    132. 

  132. +#ifdef IDN
    133. 

  133. +#include <locale.h>
    134. 

  134. +#endif
    135. 

  135. +
    136. 

  136.  #include "ping_common.h"
    137. 

  137.  #include <ctype.h>
    138. 

  138.  #include <sched.h>
    139. 

  139. @@ -97,6 +102,9 @@
    140. 

  140.  
    141. 

  141.  void common_options(int ch)
    142. 

  142.  {
    143. 

  143. +#ifdef IDN
    144. 

  144. +	setlocale(LC_ALL, "C");
    145. 

  145. +#endif
    146. 

  146.  	switch(ch) {
    147. 

  147.  	case 'a':
    148. 

  148.  		options |= F_AUDIBLE;
    149. 

  149. @@ -222,6 +230,9 @@
    150. 

  150.  	default:
    151. 

  151.  		abort();
    152. 

  152.  	}
    153. 

  153. +#ifdef IDN
    154. 

  154. +	setlocale(LC_ALL, "");
    155. 

  155. +#endif
    156. 

  156.  }
    157.