[gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/

[Anthony G. Basile]

commit:     a4b10be780253269febab591fd0a4de1eb4643fa
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 01:07:14 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 01:07:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a4b10be7

net-misc/iputils: fix USE=idn.

 net-misc/iputils/Manifest                          |  3 +-
 .../iputils-20121221-missing-AI_IDN-NI_IDN.patch   | 34 ++++++++++++++++++++++
 net-misc/iputils/iputils-20121221-r99.ebuild       |  1 +
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 61034fd..7e6d971 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -9,11 +9,12 @@ AUX iputils-20121221-fix-header-order.patch 568 SHA256 
d1ccc1defcd02ee0d0cb92d44
 AUX iputils-20121221-fix-init-elemnt.patch 677 SHA256 
302b1118596befdad56d23769e36fc0960d807230bc5c6ad4ad59d00fb78560b SHA512 
15cc4a96851eaa77f08e3914139925cecc50ff7161a693e86cb6f5ae09da5c2d232325f922c1cf4af20d639ed89071314092f31fa55e23bc5033bfb74eeda7a3
 WHIRLPOOL 
7bbd1d869275fe96b0377da3ea345bd5d60ff903f37a45967a146ab149f714aced59f66aa247bd0a028a62094823d7f46b8333dcb38a6366c978a88f38ff5ec3
 AUX iputils-20121221-fix-musl-headers.patch 2616 SHA256 
bdd3992ed19d625cfd08563ef46ab22f25ca46390ad4603e501f9c66d2508bcc SHA512 
82b88635e5fec34b4175c74d25b821d3b76b899c48aa87b7035ae8702a3ede3abaebb3d9be32cb7e853186d78db5e9c03cdd14cfc1ce9481f6ae65466815bdac
 WHIRLPOOL 
6e39b744edd175b82cece11b1d7d18083c78bfb16210c99b7e427d6382dc6722c49fd13606cd8cb14105b4ce447e44a2dac4413093495d3a4db424f3359ce907
 AUX iputils-20121221-makefile.patch 1791 SHA256 
779632822e3440f3b898a50955cb8fb72177f0d1623c9da7c0a8afa68313435f SHA512 
5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db
 WHIRLPOOL 
c0c13046265ad44d23bde66cf48f64803591b4577861fde0ad7873001cbd9284c8593ce277a39d077b5bab635d0f8aa53ad124ea724bbc4584db36570028f90f
+AUX iputils-20121221-missing-AI_IDN-NI_IDN.patch 835 SHA256 
cc5ed53cbc866541f23744ce3b690690af3869e4bc468443612dba1a8a185420 SHA512 
4061c9fb2f1aa6a001cf711dd5f7d838d72c7e9b192bb2a4dc45c6c8f72d952a84e9d0e317eb0d765be8429ece8a49863eb5d6fd02f42e63a740d09e181715f0
 WHIRLPOOL 
97d9bda6d0495c689b64e2b86cd94d8250e29093a480cda2facb11130d62ba2dd4bb9e6c151686babb7bdbc05535bcd1b0359cec2cc267481e41a69fb129b97d
 AUX iputils-20121221-openssl.patch 2378 SHA256 
cc1af5ccdd593b4fa43273cf7de8b9552f0a5d33a72a35fcc4f94cf2c6fc9a44 SHA512 
05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b
 WHIRLPOOL 
66052233f933cf30fe1572578012faa380f53580307e880e9a94c001ea14e585b3e28693c8e3883ee6350bb6af04a6931732ebaa284c4e3851b64081e042d081
 AUX iputils-20121221-owl-pingsock.diff 6374 SHA256 
915e18ee5a03f5636b408ff34a5576ad8899a3d93d5fe8182984c3565bd94375 SHA512 
2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395
 WHIRLPOOL 
205179fa205e8bd88a9077cf628ec1a060189ee01d55c45dbe754f3bc36a496531cb9eab120507eff5d72140c934a7480d6a015fa6020f7dcecdfbc6ef590443
 AUX iputils-20121221-printf-size.patch 1671 SHA256 
a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 
ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33
 WHIRLPOOL 
8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee
 AUX iputils-20121221-remove-rdisc-glibc-assumption.patch 770 SHA256 
0639fca129c3e2ca57a7e0f0d3392474665e11f139cfa9362a365b3fca9593b2 SHA512 
2ed65a0c0188cf6e06bfb5e3795fa720f7e7040533adbc1ce0c5ded435b823792790890826fc4250a6b2fba16576dc024c50d1faf9598f2fe36aadda77db8a36
 WHIRLPOOL 
a656ae24a99bc5ee6356375be963324eb7fae6aa533e3a572f95bb4695200f2f66d2fa36e037a3c55ce95dcc1643bde4f80326c3cd32ccd53754dde639a1cbd8
 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 
6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 
006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c
 WHIRLPOOL 
da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
 DIST iputils-s20121221.tar.bz2 155344 SHA256 
450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 
693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4
 WHIRLPOOL 
64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
-EBUILD iputils-20121221-r99.ebuild 3167 SHA256 
ef88f7e5e925ddc3822ab5d655231f319ca704f2c895d6e30439a256910ef71e SHA512 
f4bf6c5c5142ddf7c583e78f397a4ec86051398101eb79c710c08ea03eb341cdc0bbdd0c224225b165bf87cae053e9c5495cd271ddfa97d064c6a980a1cab1eb
 WHIRLPOOL 
37919b7510ba487c3d4c68ba38b568e535932b674a3c634149e7fc9fa6beb07bfe71e5ce3a8c4eddf4a943b3773b2d1867822692bb4f60e1fce2a60462b9d6c8
+EBUILD iputils-20121221-r99.ebuild 3232 SHA256 
eaf37d0e401d0ac74ac4a953d950c329e2bafccefa4c621dd959a50ca81bf7ab SHA512 
968cdcff43795dbea281bf000454a308b1bd8d6e824fcdec144e6220afde01edfbef0f535aac27ba8ad687afeaee3138fea0e99205082bcba4a46b2d0a65db4f
 WHIRLPOOL 
8aa33c89483aa179802897ca7c0207c50b12be10c3307a791b054feeb2fc0d0d2c218e051dcf618d38161c2c8b5a8aa93d40dc425addca27598000889f2000ea
 MISC metadata.xml 386 SHA256 
36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 
d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224
 WHIRLPOOL 
24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764

diff --git 
a/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch 
b/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
new file mode 100644
index 0000000..b6bf7ea
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
@@ -0,0 +1,34 @@
+diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
+--- iputils-s20121221.orig/ping6.c     2012-12-21 14:01:07.000000000 +0000
++++ iputils-s20121221/ping6.c  2015-07-19 00:50:45.254912002 +0000
+@@ -80,6 +80,13 @@
+ #include <stringprep.h>
+ #endif
+ 
++#ifndef AI_IDN
++#define AI_IDN        0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN        32
++#endif
++
+ #include "ping6_niquery.h"
+ #include "in6_flowlabel.h"
+ 
+diff -Naur iputils-s20121221.orig/tracepath6.c iputils-s20121221/tracepath6.c
+--- iputils-s20121221.orig/tracepath6.c        2012-12-21 14:01:07.000000000 
+0000
++++ iputils-s20121221/tracepath6.c     2015-07-19 00:51:06.490911203 +0000
+@@ -31,6 +31,13 @@
+ #include <locale.h>
+ #endif
+ 
++#ifndef AI_IDN
++#define AI_IDN  0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN  32
++#endif
++
+ #ifndef SOL_IPV6
+ #define SOL_IPV6 IPPROTO_IPV6
+ #endif

diff --git a/net-misc/iputils/iputils-20121221-r99.ebuild 
b/net-misc/iputils/iputils-20121221-r99.ebuild
index bccdd55..0b987c7 100644
--- a/net-misc/iputils/iputils-20121221-r99.ebuild
+++ b/net-misc/iputils/iputils-20121221-r99.ebuild
@@ -64,6 +64,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-20121221-remove-rdisc-glibc-assumption.patch
        epatch "${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch
        epatch "${FILESDIR}"/${PN}-20121221-fix-header-order.patch
+       epatch "${FILESDIR}"/${PN}-20121221-missing-AI_IDN-NI_IDN.patch
        use SECURITY_HAZARD && epatch 
"${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
        use static && append-ldflags -static
 }