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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/
@ 2015-07-19  1:04 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2015-07-19  1:04 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/
@ 2016-05-29 17:25 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2016-05-29 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     3557de3aeb81e53879b1aad4ffdf7a74e144a2c8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 17:26:47 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun May 29 17:26:47 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=3557de3a

net-misc/iputils: bump to 20151218

 net-misc/iputils/Manifest                          |   9 +-
 .../files/iputils-20121221-fix-musl-headers.patch  |   2 +-
 .../files/iputils-20121221-parallel-doc.patch      |  74 ++++++++++
 .../iputils/files/iputils-20121221-strtod.patch    |  45 ++++++
 .../iputils/files/iputils-99999999-openssl.patch   |  97 +++++++++++++
 .../files/iputils-99999999-tftpd-syslog.patch      |  38 +++++
 net-misc/iputils/iputils-20151218-r99.ebuild       | 153 +++++++++++++++++++++
 7 files changed, 416 insertions(+), 2 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index ecdb471..2a75532 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -7,14 +7,21 @@ AUX iputils-20121221-add-bits_types_h.patch 3092 SHA256 e198400f387fa4140c7c6a75
 AUX iputils-20121221-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c981bcf203b4c6266d4f49437c3fe67e2027b2 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 WHIRLPOOL a39c7dbb9b37849cc3560dc1f814a8c18a9ff9b55e19c3587a7c49286d55323f96d42d33c6f2723d3868506c252272e1d2d6bc3370eb935b479c89514f03c9c5
 AUX iputils-20121221-fix-header-order.patch 568 SHA256 d1ccc1defcd02ee0d0cb92d440bc786a8f508db5ee75b6c6566374d4b2a4114d SHA512 530334d2e89c13e3a15f4098a1a9eff9bda9d60118fd6e6ceba30453513c5deb9e33f609206a220c7a4af52704bfe6d3be1baa7a218265b0b6c9b95475b5cc7d WHIRLPOOL 01a377c067aed7e4c3be96bab4d74e9bcde48d7b73d65aa2184d9416dbdf02962b87a5c77dc4966890798f698128c5bb81021051071ee41fe5386d0efebb08fd
 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-fix-musl-headers.patch 2610 SHA256 79103835008cc293f331bd00f14ae44f40847cddb73e981fff06b275960be2ad SHA512 d6dacbc271b75ed9125e2527118db7a97382bc1456ac6bb3f94b0307ea1e61011c977f3a51cbbb0b86eb9048c5d0f419abd1562499195ad3ca97c62a6039b7c7 WHIRLPOOL 89c7e9d322d974e15df3be4a851dcce06af238ff8bd0a75e08dfe7c5f3de45f2067518479bc19242c92da2531d82bd77158b045cb2009ebe73e4d0f6a7295994
 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-parallel-doc.patch 2042 SHA256 151aed9018976387d4001050b41ad5e28630a6e8ab88a0f8501ceb5c9424620e SHA512 cc3a0416c1380d4b799412769270f8fa522a8f931706b318f33add4b02b82e76b177ae6c976408405a83a6c84036f918a41cb3008ee17bf39ea30e8d1f5dc46d WHIRLPOOL adf1b6f7351dd3a255403529268b0c805198905123d6663ef860c72c6bf848029158419b701be39ce144f575de76b76140836ae30259aef2662df9e1c2a57659
 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
+AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a
+AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
+AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
 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
+DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
+DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7
 EBUILD iputils-20121221-r99.ebuild 3120 SHA256 0892b106c9cb0c508d9362f3819a04420110882c25a67646573d83daf8dc31d2 SHA512 deb5adb03d585872a376ede9432b199902c9e976465c2e30470fcb44177145193457d8f982c21b66a28fd08f854af1b16a8f8a99c1254c72dca74ef79b837ab4 WHIRLPOOL 02ca152098b1fcc6c1769bc908218f1751fe3dea637427cb2024fc084ef7181b092592f51732aeb481c5d7411ea97addd414a9c411ce55363649ca14c589f228
+EBUILD iputils-20151218-r99.ebuild 3956 SHA256 2be3eae8c8add0e5c151320f471ece3fdf05e4aebb106f87d925762abc756e31 SHA512 deddd30b8185aeaa8028e3671dd9592a4d7c6a612e7cd8e83f08c02df0c5878c3ffa0ee964baa3dde7df48180bf68efdbc03f18782f9448262706c8b6ccf06d1 WHIRLPOOL 1afad2301bb42d5f2883895b9931b57f7921c7f2f6367fc05fd2ad0ccd32ee1498f4706ae63984afbc31c5c8e5b143aab7bf3822c06476622a7a3c5b7c6a632b
 MISC metadata.xml 540 SHA256 3117c06c00e23b33b2fcb3e6763b84919d338f914293c90337f5189dc1dce28c SHA512 cbbfa8df01e3e26e0dd1d978ad0f80c4ab42f5f424f0334db5efa849eb829ae1513753f2f37c7db848ab59151324bb4149b492028dc34557e2531da31016a738 WHIRLPOOL b92192675cbfb92dbd4acfb56b776f02837f4db8c67ab97922d27f29b922e091f5c0b55132570f4edc98bda8debdda804d0f056032525e7ddbc36bcd929edee3

diff --git a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch b/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
index d12dd82..cd1ff55 100644
--- a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
+++ b/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
@@ -39,7 +39,7 @@ diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
  #include <string.h>
  #include <netdb.h>
  #include <setjmp.h>
-+#include <asm-generic/param.h>
++#include <linux/param.h>
  
  #ifdef CAPABILITIES
  #include <sys/prctl.h>

diff --git a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
new file mode 100644
index 0000000..22bfb88
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
@@ -0,0 +1,74 @@
+From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 1 Aug 2012 11:43:34 -0400
+Subject: [PATCH iputils] doc: fix parallel build of html/man pages
+
+The use of the same tempdir prevents building of these files in parallel.
+So build all of them in unique tempdirs so we can do them in parallel.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ doc/Makefile | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 7ec4f1c..4f930a3 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -12,29 +12,40 @@ man: $(MANFILES)
+ # lots of some strange temporary junk directories and files.
+ # So, scope it to a temporary dir and clean all after each run.
+ 
+-$(HTMLFILES): index.db
+-	@-rm -rf tmp.db2html
+-	@mkdir tmp.db2html
+-	@set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
+-	@-rm -rf tmp.db2html
++SETUP_TMPDIR = \
++	t="tmp.db2html.$@"; \
++	rm -rf $$t; \
++	mkdir $$t; \
++	cd $$t
++CLEAN_TMPDIR = \
++	cd ..; \
++	rm -rf $$t
++
++MAKE_HTML = \
++	@set -e; \
++	$(SETUP_TMPDIR); \
++	docbook2html ../$<; \
++	mv *.html ..; \
++	$(CLEAN_TMPDIR)
+ 
++$(HTMLFILES): index.db
++	$(MAKE_HTML)
+ iputils.html: iputils.db
+-	@-rm -rf tmp.db2html
+-	@mkdir tmp.db2html
+-	@set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
+-	@-rm -rf tmp.db2html
++	$(MAKE_HTML)
+ 
+ # docbook2man produces utterly ugly output and I did not find
+ # any way to customize this but hacking backend perl script a little.
+ # Well, hence...
+ 
+ $(MANFILES): index.db
+-	@-mkdir tmp.db2man
+-	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
+-	@-rm -rf tmp.db2man
++	@set -e; \
++	$(SETUP_TMPDIR); \
++	nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
++	mv $@ ..; \
++	$(CLEAN_TMPDIR)
+ 
+ clean:
+-	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
++	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
+ 
+ snapshot:
+ 	@date "+%y%m%d" > snapshot.db
+-- 
+2.3.5
+

diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch b/net-misc/iputils/files/iputils-20121221-strtod.patch
new file mode 100644
index 0000000..303acf5
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-strtod.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/472592
+
+From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 24 Apr 2015 20:41:31 -0400
+Subject: [PATCH iputils] ping: fix -i number parsing in locales
+
+Always use #.# format for the -i flag even when the current locale uses
+a different separator.  Locale de_DE which uses #,# normally.
+
+Simple testcase:
+$ make USE_IDN=1
+$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
+
+Reported-by: Sergey Fionov <fionov@gmail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ ping_common.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/ping_common.c b/ping_common.c
+index 62f53a6..0a37e09 100644
+--- a/ping_common.c
++++ b/ping_common.c
+@@ -269,9 +269,17 @@ void common_options(int ch)
+ 		double dbl;
+ 		char *ep;
+ 
++#ifdef USE_IDN
++		setlocale(LC_ALL, "C");
++#endif
++
+ 		errno = 0;
+ 		dbl = strtod(optarg, &ep);
+ 
++#ifdef USE_IDN
++		setlocale(LC_ALL, "");
++#endif
++
+ 		if (errno || *ep != '\0' ||
+ 		    !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
+ 			fprintf(stderr, "ping: bad timing interval\n");
+-- 
+2.3.5
+

diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch
new file mode 100644
index 0000000..13f5639
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-openssl.patch
@@ -0,0 +1,97 @@
+From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:32:39 -0500
+Subject: [PATCH iputils] ping6: allow disabling of openssl support
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile         |  5 ++++-
+ iputils_md5dig.h |  4 +++-
+ ping6.c          | 10 ++++++++++
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 54e5a6d..7147f08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
+ 
+ # Libgcrypt (for MD5) for ping6 [yes|no|static]
+ USE_GCRYPT=yes
+-# Crypto library for ping6 [shared|static]
++# Crypto library for ping6 [shared|static|no]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+ USE_RESOLV=yes
+@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
+ 	DEF_CRYPTO = -DUSE_GCRYPT
+ else
++ifneq ($(USE_CRYPTO),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
++	DEF_CRYPTO = -DUSE_OPENSSL
++endif
+ endif
+ 
+ # USE_RESOLV: LIB_RESOLV
+diff --git a/iputils_md5dig.h b/iputils_md5dig.h
+index 4cec866..d6c4d46 100644
+--- a/iputils_md5dig.h
++++ b/iputils_md5dig.h
+@@ -5,8 +5,10 @@
+ # include <stdlib.h>
+ # include <gcrypt.h>
+ # define IPUTILS_MD5DIG_LEN	16
+-#else
++# define USE_CRYPTO
++#elif defined(USE_OPENSSL)
+ # include <openssl/md5.h>
++# define USE_CRYPTO
+ #endif
+ 
+ #ifdef USE_GCRYPT
+diff --git a/ping6.c b/ping6.c
+index 7085f31..7b7c1af 100644
+--- a/ping6.c
++++ b/ping6.c
+@@ -324,6 +324,7 @@ static void niquery_init_nonce(void)
+ #if !PING6_NONCE_MEMORY
+ static int niquery_nonce(__u8 *nonce, int fill)
+ {
++# ifdef USE_CRYPTO
+ 	static __u8 digest[MD5_DIGEST_LENGTH];
+ 	static int seq = -1;
+ 
+@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
+ 			return -1;
+ 		return ntohsp((__u16 *)nonce);
+ 	}
++# else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++# endif
+ }
+ #endif
+ 
+@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
+ 
+ static int niquery_option_subject_name_handler(int index, const char *arg)
+ {
++#ifdef USE_CRYPTO
+ 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
+ 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
+ 	int n;
+@@ -625,6 +631,10 @@ errexit:
+ 	free(idn);
+ 	free(name);
+ 	exit(1);
++#else
++	fprintf(stderr, "ping6: function not available; crypto disabled\n");
++	exit(3);
++#endif
+ }
+ 
+ int niquery_option_help_handler(int index, const char *arg)
+-- 
+2.3.5
+

diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
new file mode 100644
index 0000000..ad34f3b
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
@@ -0,0 +1,38 @@
+From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 19 Apr 2014 10:39:39 -0400
+Subject: [PATCH iputils] tftpd: fix syslog setup
+
+Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
+the set*id calls, but would call syslog() before it had called openlog().
+Move the call up earlier to fix that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tftpd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tftpd.c b/tftpd.c
+index e3af2f4..7ddc8eb 100644
+--- a/tftpd.c
++++ b/tftpd.c
+@@ -109,6 +109,8 @@ int main(int ac, char **av)
+ 	register int n = 0;
+ 	int on = 1;
+ 
++	openlog("tftpd", LOG_PID, LOG_DAEMON);
++
+ 	/* Sanity. If parent forgot to setuid() on us. */
+ 	if (geteuid() == 0) {
+ 		if (setgid(65534)) {
+@@ -125,7 +127,6 @@ int main(int ac, char **av)
+ 	while (ac-- > 0 && n < MAXARG)
+ 		dirs[n++] = *av++;
+ 
+-	openlog("tftpd", LOG_PID, LOG_DAEMON);
+ 	if (ioctl(0, FIONBIO, &on) < 0) {
+ 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
+ 		exit(1);
+-- 
+2.3.5
+

diff --git a/net-misc/iputils/iputils-20151218-r99.ebuild b/net-misc/iputils/iputils-20151218-r99.ebuild
new file mode 100644
index 0000000..260b1c7
--- /dev/null
+++ b/net-misc/iputils/iputils-20151218-r99.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and when the jade/sgml packages are broken (which
+# seems to be more common than would be nice).
+
+EAPI=5
+
+inherit flag-o-matic eutils toolchain-funcs fcaps
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
+	inherit git-2
+else
+	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
+		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	KEYWORDS="amd64 arm ~mips ppc x86"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
+
+LICENSE="BSD-4"
+SLOT="0"
+IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-misc/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/openjade
+		dev-perl/SGMLSpm
+		app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+	"
+fi
+
+S=${WORKDIR}/${PN}-s${PV}
+
+PATCHES=(
+	"${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
+	"${FILESDIR}"/${PN}-99999999-openssl.patch #335436
+	"${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
+	"${FILESDIR}"/${PN}-20121221-makefile.patch
+	"${FILESDIR}"/${PN}-20121221-parallel-doc.patch
+	"${FILESDIR}"/${PN}-20121221-strtod.patch #472592
+	"${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch #for musl
+	"${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch  #for musl
+	"${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch #for musl
+)
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch )
+	epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	IPV4_TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	IPV6_TARGETS=(
+		ping6
+		$(usex tracepath 'tracepath6' '')
+		$(usex traceroute 'traceroute6' '')
+	)
+	use ipv6 || IPV6_TARGETS=()
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GCRYPT=$(usex gcrypt) \
+		USE_CRYPTO=$(usex ssl) \
+		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
+		IPV6_TARGETS="${IPV6_TARGETS[*]}"
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping $(usex ipv6 'ping6' '')
+	use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosbin tracepath6
+		dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL RELNOTES
+
+	use doc && dohtml doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex ipv6 'bin/ping6' '') \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/
@ 2017-10-28 19:00 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-10-28 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     396769d17badb8956a26bba64cd68f39d6dc7fb7
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Oct 28 18:57:37 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Oct 28 18:59:40 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=396769d1

net-misc/iputils: version bump to 20171016_pre

 net-misc/iputils/Manifest                          | 17 ++--
 ...0150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch | 90 ----------------------
 .../files/iputils-20150815-scope-delimiter.patch   | 14 ----
 ...0171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch | 70 +++++++++++++++++
 .../files/iputils-20171016-scope-delimiter.patch   | 14 ++++
 .../files/iputils-99999999-tracepath46.patch       | 30 ++++++++
 net-misc/iputils/files/rarpd.init.d                |  1 -
 net-misc/iputils/iputils-20121221-r1.ebuild        |  4 +-
 net-misc/iputils/iputils-20151218.ebuild           |  6 +-
 ...20160308.ebuild => iputils-20171016_pre.ebuild} | 74 ++++++++++--------
 10 files changed, 170 insertions(+), 150 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 856c8ba..29e3eee 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -14,21 +14,22 @@ AUX iputils-20121221-parallel-doc.patch 2042 SHA256 151aed9018976387d4001050b41a
 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
 AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a
-AUX iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch 2309 SHA256 1a0f047dd94c631ef5edf6cb78e401d856315ffb9f2130a0a3b5bdd044ce537a SHA512 e3f7e86bf27f9fa2c51ba33c4d83c27e9669861d49af05493736ce0f345ca88743975fedb1d5d1e95d819fccaa47233cb842ea8995d9b7dc1c470dfc867b3c06 WHIRLPOOL 6b6d04e80839616abce28097e7edf702b5e874be40e78aa528a6db0a659656e4c6403eea661e2cb4192b2b4596c3679d6b1e4eaebf9c793435624eb058637336
 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
 AUX iputils-20150815-remove-rdisc-glibc-assumption.patch 803 SHA256 328cd59dc3046b078544e7aa7173bbcbc564c887c4cf04cf2b28a9158ef02118 SHA512 a4babd90df642c13c77186f84a5742420118dcf3d351ccd13ae287a166e331b050af62d9ab617af404957286bff8676c6109e813dc64781b571d6f7daea6ce1d WHIRLPOOL aa2d39d7bcf9fabd39cfc1079ed6893ac4d4feaa7074c856af07db569c2f7e369e765c4736a46aca4675b49e4e28b07657ca663546b9d9cafdcda20377579e20
-AUX iputils-20150815-scope-delimiter.patch 456 SHA256 7c594216c47f345778cb270a93bdf9da76b05eb44d8452cd916e11c30f96d64b SHA512 2a53d4c1ffcbd50ec5a7adaf4170010e3bcee14031773ebc22a924105d28ed40841f3b275abfed8f51b2dc0376245e0d3fc22a1682fb639f46370406deec6c57 WHIRLPOOL ac046ccb33711d9c53b52f3130f23fdb494ce4c529b8fc1226d493bda444e3034770aec3789a8f275555d53b10ea9e40581189d6dfe0c9b8066151a85dee6a19
+AUX iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch 2328 SHA256 54f8db1ec0327a05cb3316a8089f506a249d42dac8420dcde5ecf18acc04bef8 SHA512 d2b3c68a9297e22ab033b5126adabe397201f6a84d6f0105233c20746b0826e6ed7318bba30f637ad4f3a19e1812a2a5a02c2eaafcc824b445f58518b8b1d408 WHIRLPOOL 4f34a35c8918951aaf0916f724901d4f9afc98a10a28e28f72f76fd7686610007c8c216ed794f161962e4f9588bc52a15e094cab2c17b4c1decfa8210026e0b5
+AUX iputils-20171016-scope-delimiter.patch 582 SHA256 850b3c699ec0dbb01ce90b13981d5670ea9af00c2c3af6390289e9f3182f5f01 SHA512 313d47f18dcd1320de59c9bde0ee8baa2817c1145b5ee9aa6c6c6663a0072a2525589c0c2d282db2726d63a81716926a4ce2d841ffec2cc35229174c75e237ec WHIRLPOOL ee3d0f1296931b6dcdf4577f91b96acf4277bea49d85926ed189aacb11856d65d348c0a200a588c44a02e62c21bea33d1f4ae96b597b23f7328059f1c83fef64
 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
+AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
 AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf
-AUX rarpd.init.d 590 SHA256 a2ba31119ad6b5ea5cd8932a28aeac6621979cc001f00cfeed2900d5a3087799 SHA512 16d9276aa0f7c5fc808123d4344e9884a436c0cb7cfab74c283cdccb6312ad3403e83a1691da75671515511cfab5f1d4063fa5adc4c071034d240e3be5b11666 WHIRLPOOL c3b38a2bb65ebbb001cef510b6ecba9b9ed2147e95aacd4dd5fb51a626a6437bc7462729140c89e37f131ae4005638e557ef38abc355e9ca01c884633e73f2d3
-DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf
+AUX rarpd.init.d 583 SHA256 4b3efb6723a0c0b9ef7988ed9d3100ece49180483aa51fb69cf055e5d1565391 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada WHIRLPOOL aa25eb5ca849825842d9968ff0928552bb6070b1e8435e74b1af579c6382332941ae4f99c02c3a3eedd34474814e74733d9f15e4c88583aeb06003d508338e48
+DIST iputils-20171016_pre.tar.gz 195254 SHA256 2f1870633baeb999fe214a8958353f291caf3cedac242862930d41c760bf1748 SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 WHIRLPOOL 76600ed31bfa10535c7aa6e33ab5019db8814c55ca9941a3857300bccb89650cdc8edea9d654103151bc5f54643f5618c9261d7ba5fa5c14e8f6293bca340db7
+DIST iputils-manpages-20171016_pre.tar.xz 29764 SHA256 f23e5bee1d59c5b8cabc47faab5d175de1c5b663379108ec70e75d2a74888883 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 WHIRLPOOL a80cfa73dd326dedff76de06b3939f631ff017e3bd5cbeb0f988eb27ad997c62c2be1dc645f3e415b7081942a0cbf9139729c998c77b47c989ccd61ad272cf6e
 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
 DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
 DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7
-DIST iputils-s20160308-manpages.tar.xz 22684 SHA256 e21ef842d2eb4fa21f64cb872101bc9f979d24127fb680247d4a95ffc94a3958 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac WHIRLPOOL 2675551b615efdf54a77bcb1dbe22c89b1ae5cd783c7bf33c703b81f54239096c1a7e13e7c8d6abd8b4ed5b0cbbd6f3b59d4102279c8cfb6f0a0bf6e070aab93
-EBUILD iputils-20121221-r1.ebuild 3189 SHA256 0da1bfe9752732d2d3a27c074182115934936de7631517843c17fb0aec82ba04 SHA512 b87f51cfc9a86688fe7a2fa1c06b5e9cc8af143e4eb7e2ca0f029d8b040e4130ec50a35ba1e7c11eb058f92fbfd683fed1c8e30071a8119cf6aeda0f0487bccb WHIRLPOOL 8ee7802aee88921186a2d87034f29ecc3839f9fea643ae03bfe1fe67783f8a9acaf61e5320e6ad2563f61f3d884486c838ff85a2b73e479e92fcf88f78d2fda3
-EBUILD iputils-20151218.ebuild 4317 SHA256 943968d4e3cb11933f255dbae747fb0bb441cc3ef89163358da1ad674dc45355 SHA512 8b8f5a887f8dad95bf752523d60729112de1f12d768450a84c6d1479a2a25697a13bba464b10abcf0cd54ebed8c0785ea0ff6db9b672309a9706895f2754d30e WHIRLPOOL 65fc68c9bc8a81b42c633e660c36686aa5c33710166c04839e8cd145b112147a1e52aafe0762004e349330f844a01f37246be354005f95ec8513e67b5d8d7185
-EBUILD iputils-20160308.ebuild 4029 SHA256 1c4d13dc26f101e776c07a6eda64fc1169b5900d9e1f6184ac5b3ed559bf05d6 SHA512 422f88a90c76a4fb7d955a4333afbe7ed5ac46ea6ea1967d80494316e7bed7358e3ef50229d2d2adb86a2346a5dbbd60102a5b443c975366e4bb9c183d9642a0 WHIRLPOOL c192eb8dbfe67159e4dec5d00dca3b3cb581e78dfc9e33ed6f328d035c999b33da2d61f1ed8ecbaf11f9096dab60564474d22df55b627f49c3fb47126b17653e
+EBUILD iputils-20121221-r1.ebuild 3200 SHA256 c8366b5fd040eb4224264cb0fca20d17bf89a27658d8196ed5e461c31fc48ce8 SHA512 545f22070d3d9fab6e284247046e3eb65d3a80f19ca35f6ef55a1839149893ebd7a5c04ec5f63ef28e150d52f9a8ec227e43417e2bd595bd6fec9545ebe15a36 WHIRLPOOL cd71680060b158c67a32846d8911b7d348ab04eb6235ce3d752c8a4c3bccfaee113f2926cfdecc4374779e934e66f6dc17a13fa9c79ce20ab5dd5d0469eaf22b
+EBUILD iputils-20151218.ebuild 4329 SHA256 fd5dcdbd604f900d2829a8c4ce508825a7f429359459506cf9f7a5aae8a466ad SHA512 a270c3377db404b44bb5b38b220f6ba2c05f51e0807cf998741ef7fa60a929d566121e09fa0a8b6b835ae58f84f322b990268525ee230a254d14792f1c8edafa WHIRLPOOL c2a22e6dfe5bc9beb91efcd97061e08ab83e7356a5a2f8f8e0579925110396afd98ad4ed045296eef4b87cd45104a7d6ea9d06bcbb04c6388bcd92f93acf859a
+EBUILD iputils-20171016_pre.ebuild 4236 SHA256 a1e0877f390ef0c051e1f19b3d78149d577002e978270d270e569f4dfef90720 SHA512 86a987d028e52638cec8fceedc2fcdfb4b503378fa1a4e0cb8aa10b28ec30ebca9c318ceab60c9c3cfc74f51642dc63bd529dbe86542722a0aa2d993e981a0dd WHIRLPOOL 8cf1c251e369fba0350b7a92e9c0ad6291de8d43f7582072c474ebf69618eeac45ec3e05f54bf25ce22ee75fa09f2c79950ff41c82ef5206ea428ebcb6bd124e
 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e

diff --git a/net-misc/iputils/files/iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch b/net-misc/iputils/files/iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
deleted file mode 100644
index 19fadf4..0000000
--- a/net-misc/iputils/files/iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur iputils-s20150815.orig/arping.c iputils-s20150815/arping.c
---- iputils-s20150815.orig/arping.c	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815/arping.c	2016-03-12 14:19:28.045630934 -0800
-@@ -45,6 +45,13 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
- #endif
- 
- #include "SNAPSHOT.h"
-diff -Naur iputils-s20150815.orig/ping.h iputils-s20150815/ping.h
---- iputils-s20150815.orig/ping.h	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815/ping.h	2016-03-12 14:19:51.634859603 -0800
-@@ -38,6 +38,17 @@
- #include <locale.h>
- #include <idna.h>
- #include <stringprep.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
- #else
-diff -Naur iputils-s20150815.orig/tracepath.c iputils-s20150815/tracepath.c
---- iputils-s20150815.orig/tracepath.c	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815/tracepath.c	2016-03-12 14:20:24.124174547 -0800
-@@ -29,6 +29,17 @@
- #include <idna.h>
- #include <locale.h>
- 
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
-diff -Naur iputils-s20150815.orig/tracepath6.c iputils-s20150815/tracepath6.c
---- iputils-s20150815.orig/tracepath6.c	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815/tracepath6.c	2016-03-12 14:19:00.838370686 -0800
-@@ -30,6 +30,13 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
- #endif
- 
- #ifndef SOL_IPV6
-diff -Naur iputils-s20150815.orig/traceroute6.c iputils-s20150815/traceroute6.c
---- iputils-s20150815.orig/traceroute6.c	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815/traceroute6.c	2016-03-12 14:19:00.839370696 -0800
-@@ -250,6 +250,10 @@
- #include <idna.h>
- #include <locale.h>
- 
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0

diff --git a/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch b/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch
deleted file mode 100644
index bb1f1b6..0000000
--- a/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurw iputils-s20150815/ping.c iputils-s20150815.new/ping.c
---- iputils-s20150815/ping.c	2015-08-15 07:07:28.000000000 -0700
-+++ iputils-s20150815.new/ping.c	2015-10-05 14:49:33.300065816 -0700
-@@ -80,6 +80,10 @@
- #define	NROUTES		9		/* number of record route slots */
- #define TOS_MAX		255		/* 8-bit TOS field */
- 
-+#ifndef SCOPE_DELIMITER
-+# define SCOPE_DELIMITER '%'
-+#endif
-+
- static const int max_ping4_packet = 0x10000;
- 
- static int ts_type;

diff --git a/net-misc/iputils/files/iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch b/net-misc/iputils/files/iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
new file mode 100644
index 0000000..94338cc
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
@@ -0,0 +1,70 @@
+diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/arping.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/arping.c
+--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/arping.c	2017-10-16 01:44:15.000000000 -0700
++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/arping.c	2017-10-28 11:50:51.803318287 -0700
+@@ -45,6 +45,13 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
+ #endif
+ 
+ #include "SNAPSHOT.h"
+diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.h iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.h
+--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.h	2017-10-16 01:44:15.000000000 -0700
++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.h	2017-10-28 11:51:15.378317864 -0700
+@@ -38,6 +38,17 @@
+ #include <locale.h>
+ #include <idna.h>
+ #include <stringprep.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef AI_CANONIDN
++#define AI_CANONIDN 0x0080
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
+ #define getnameinfo_flags NI_IDN
+ #else
+diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/tracepath.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/tracepath.c
+--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/tracepath.c	2017-10-16 01:44:15.000000000 -0700
++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/tracepath.c	2017-10-28 11:53:11.880315778 -0700
+@@ -30,6 +30,14 @@
+ #ifdef USE_IDN
+ #include <idna.h>
+ #include <locale.h>
++
++#ifndef AI_IDN
++#define AI_IDN 0x0040
++#endif
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0
+diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/traceroute6.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/traceroute6.c
+--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/traceroute6.c	2017-10-16 01:44:15.000000000 -0700
++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/traceroute6.c	2017-10-28 11:53:39.517315283 -0700
+@@ -247,6 +247,10 @@
+ #include <idna.h>
+ #include <locale.h>
+ 
++#ifndef NI_IDN
++#define NI_IDN 32
++#endif
++
+ #define getnameinfo_flags	NI_IDN
+ #else
+ #define getnameinfo_flags	0

diff --git a/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch b/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch
new file mode 100644
index 0000000..a73bc97
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch
@@ -0,0 +1,14 @@
+diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c
+--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c	2017-10-16 01:44:15.000000000 -0700
++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c	2017-10-28 11:48:03.198321306 -0700
+@@ -77,6 +77,10 @@
+ #define	NROUTES		9		/* number of record route slots */
+ #define TOS_MAX		255		/* 8-bit TOS field */
+ 
++#ifndef SCOPE_DELIMITER
++# define SCOPE_DELIMITER '%'
++#endif
++
+ static int ts_type;
+ static int nroute = 0;
+ static __u32 route[10];

diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
new file mode 100644
index 0000000..20d017b
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
@@ -0,0 +1,30 @@
+From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 19 Oct 2017 17:38:20 +0200
+Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
+ `tracepath6`
+
+---
+ tracepath.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..d2a6edf 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -394,6 +394,12 @@ int main(int argc, char **argv)
+ 	setlocale(LC_ALL, "");
+ #endif
+ 
++	/* Support being called using `tracepath4` or `tracepath6` symlinks */
++	if (argv[0][strlen(argv[0])-1] == '4')
++		hints.ai_family = AF_INET;
++	else if (argv[0][strlen(argv[0])-1] == '6')
++		hints.ai_family = AF_INET6;
++
+ 	while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
+ 		switch(ch) {
+ 		case '4':
+-- 
+2.14.3
+

diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
index bf8cf1e..27081fc 100644
--- a/net-misc/iputils/files/rarpd.init.d
+++ b/net-misc/iputils/files/rarpd.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 pidfile="/var/run/rarpd.pid"
 command="/usr/sbin/rarpd"

diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
index 7cd1500..9bcdd13 100644
--- a/net-misc/iputils/iputils-20121221-r1.ebuild
+++ b/net-misc/iputils/iputils-20121221-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -21,7 +21,7 @@ fi
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
-LICENSE="BSD-4"
+LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 

diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
index 60aff35..ffa652d 100644
--- a/net-misc/iputils/iputils-20151218.ebuild
+++ b/net-misc/iputils/iputils-20151218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
@@ -21,9 +21,9 @@ fi
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
-LICENSE="BSD-4"
+LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )

diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
similarity index 64%
rename from net-misc/iputils/iputils-20160308.ebuild
rename to net-misc/iputils/iputils-20171016_pre.ebuild
index 4745980..d681f2c 100644
--- a/net-misc/iputils/iputils-20160308.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
-EAPI=5
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
 
-inherit flag-o-matic eutils toolchain-funcs fcaps
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
-LICENSE="BSD-4"
+LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn[static-libs(+)] )
@@ -43,32 +45,33 @@ RDEPEND="arping? ( !net-misc/arping )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
+	virtual/os-headers
+"
 if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
 	"
 fi
 
 REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
 
-S=${WORKDIR}/${PN}-s${PV}
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
-PATCHES=(
-	# musl patches
-	"${FILESDIR}/${PN}-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch"
-	"${FILESDIR}/${PN}-20150815-remove-rdisc-glibc-assumption.patch"
-	"${FILESDIR}/${PN}-20150815-scope-delimiter.patch"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
-	"${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-tracepath46.patch
+	"${FILESDIR}"/${PN}-20150815-remove-rdisc-glibc-assumption.patch
+	"${FILESDIR}"/${PN}-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
+	"${FILESDIR}"/${PN}-20171016-scope-delimiter.patch
 )
 
 src_prepare() {
-	epatch ${PATCHES[@]}
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
 }
 
 src_configure() {
@@ -80,7 +83,6 @@ src_configure() {
 	)
 	if use ipv6 ; then
 		TARGETS+=(
-			$(usex tracepath 'tracepath6' '')
 			$(usex traceroute 'traceroute6' '')
 		)
 	fi
@@ -110,7 +112,9 @@ src_compile() {
 		${myconf[@]}
 
 	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
+		emake man
+
+		use doc && emake html
 	fi
 }
 
@@ -131,8 +135,14 @@ src_install() {
 
 	into /usr
 
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
 	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+	for u in clockdiff rarpd rdisc tftpd ; do
 		if use ${u} ; then
 			case ${u} in
 			clockdiff) dobin ${u};;
@@ -143,7 +153,7 @@ src_install() {
 	done
 
 	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
+		dosym tracepath /usr/sbin/tracepath6
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
@@ -157,9 +167,9 @@ src_install() {
 		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
 	fi
 
-	dodoc INSTALL RELNOTES
+	dodoc INSTALL.md
 
-	use doc && dohtml doc/*.html
+	use doc && dodoc doc/*.html
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/
@ 2018-01-03 18:43 Aric Belsito
  0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2018-01-03 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     7b5c188d7e91deb52c739f00ba03336c63f69061
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Wed Jan  3 17:09:35 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Jan  3 17:09:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b5c188d

net-misc/iputils: in tree works, see #643026

 net-misc/iputils/Manifest                          |   2 -
 .../files/021109-uclibc-no-ether_ntohost.patch     |  24 ---
 .../files/iputils-20071127-nonroot-floodping.patch |  11 --
 .../files/iputils-20121221-add-bits_types_h.patch  |  94 ------------
 .../files/iputils-20121221-fix-header-order.patch  |  18 ---
 .../files/iputils-20121221-fix-init-elemnt.patch   |  23 ---
 .../files/iputils-20121221-fix-musl-headers.patch  |  89 -----------
 .../iputils/files/iputils-20121221-makefile.patch  |  61 --------
 .../iputils-20121221-missing-AI_IDN-NI_IDN.patch   |  34 -----
 .../files/iputils-20121221-parallel-doc.patch      |  74 ---------
 ...ls-20121221-remove-rdisc-glibc-assumption.patch |  30 ----
 .../iputils/files/iputils-20121221-strtod.patch    |  45 ------
 .../iputils/files/iputils-99999999-openssl.patch   |  97 ------------
 .../files/iputils-99999999-tftpd-syslog.patch      |  38 -----
 net-misc/iputils/files/rarpd.conf.d                |   8 -
 net-misc/iputils/files/rarpd.init.d                |  19 ---
 net-misc/iputils/iputils-20151218.ebuild           | 166 ---------------------
 net-misc/iputils/metadata.xml                      |  23 ---
 18 files changed, 856 deletions(-)

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
deleted file mode 100644
index d87ff4b..0000000
--- a/net-misc/iputils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
-DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7

diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
deleted file mode 100644
index e790d2b..0000000
--- a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iputils/rarpd.c.mps	2004-06-10 15:27:01.000000000 +0200
-+++ iputils/rarpd.c	2004-06-10 15:26:29.000000000 +0200
-@@ -42,7 +42,9 @@ int listen_arp;
- char *ifname;
- char *tftp_dir = "/etc/tftpboot";
- 
-+#ifndef __UCLIBC__
- extern int ether_ntohost(char *name, unsigned char *ea);
-+#endif
- void usage(void) __attribute__((noreturn));
- 
- struct iflink
-@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
- 				6,
- 			};
- 
-+#ifndef __UCLIBC__
- 			if (ether_ntohost(ename, lladdr) != 0 ||
-+#else
-+			if (
-+#endif
- 			    (hp = gethostbyname(ename)) == NULL) {
- 				if (verbose)
- 					syslog(LOG_INFO, "not found in /etc/ethers");

diff --git a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
deleted file mode 100644
index cae8779..0000000
--- a/net-misc/iputils/files/iputils-20071127-nonroot-floodping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20071127/ping_common.h.orig	2008-06-10 11:16:06.000000000 +0100
-+++ iputils-s20071127/ping_common.h	2008-06-10 11:16:18.000000000 +0100
-@@ -28,7 +28,7 @@
- 
- #define	MAXWAIT		10		/* max seconds to wait for response */
- #define MININTERVAL	10		/* Minimal interpacket gap */
--#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
-+#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
- 
- #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
- 

diff --git a/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch b/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
deleted file mode 100644
index 9ea3418..0000000
--- a/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur iputils-s20121221.orig/clockdiff.c iputils-s20121221/clockdiff.c
---- iputils-s20121221.orig/clockdiff.c	2014-01-24 15:32:49.111934548 +0000
-+++ iputils-s20121221/clockdiff.c	2014-01-24 15:32:14.438932610 +0000
-@@ -23,6 +23,8 @@
- #include <sys/capability.h>
- #endif
- 
-+#include "types.h"
-+
- void usage(void) __attribute__((noreturn));
- 
- #define MAX_HOSTNAMELEN	NI_MAXHOST
-diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
---- iputils-s20121221.orig/ping.c	2014-01-24 15:32:49.111934548 +0000
-+++ iputils-s20121221/ping.c	2014-01-24 15:32:14.459932611 +0000
-@@ -59,6 +59,7 @@
-  */
- 
- #include "ping_common.h"
-+#include "types.h"
- 
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
-diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
---- iputils-s20121221.orig/ping6.c	2014-01-24 15:32:49.112934549 +0000
-+++ iputils-s20121221/ping6.c	2014-01-24 15:32:14.439932610 +0000
-@@ -67,6 +67,7 @@
-  *	This program has to run SUID to ROOT to access the ICMP socket.
-  */
- #include "ping_common.h"
-+#include "types.h"
- 
- #include <linux/filter.h>
- #include <netinet/ip6.h>
-diff -Naur iputils-s20121221.orig/ping_common.c iputils-s20121221/ping_common.c
---- iputils-s20121221.orig/ping_common.c	2014-01-24 15:32:49.112934549 +0000
-+++ iputils-s20121221/ping_common.c	2014-01-24 15:32:14.439932610 +0000
-@@ -1,4 +1,5 @@
- #include "ping_common.h"
-+#include "types.h"
- #include <ctype.h>
- #include <sched.h>
- #include <math.h>
-diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
---- iputils-s20121221.orig/ping_common.h	2014-01-24 15:32:14.419932609 +0000
-+++ iputils-s20121221/ping_common.h	2014-01-24 15:33:08.206935616 +0000
-@@ -35,6 +35,7 @@
- #include <linux/errqueue.h>
- 
- #include "SNAPSHOT.h"
-+#include "types.h"
- 
- #define	DEFDATALEN	(64 - 8)	/* default data length */
- 
-diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
---- iputils-s20121221.orig/rdisc.c	2014-01-24 15:32:49.113934549 +0000
-+++ iputils-s20121221/rdisc.c	2014-01-24 15:32:14.450932610 +0000
-@@ -62,6 +62,7 @@
- #include <syslog.h>
- 
- #include "SNAPSHOT.h"
-+#include "types.h"
- 
- struct interface
- {
-diff -Naur iputils-s20121221.orig/traceroute6.c iputils-s20121221/traceroute6.c
---- iputils-s20121221.orig/traceroute6.c	2014-01-24 15:32:49.113934549 +0000
-+++ iputils-s20121221/traceroute6.c	2014-01-24 15:32:14.440932610 +0000
-@@ -267,6 +267,7 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#include "types.h"
- #include "SNAPSHOT.h"
- 
- #ifndef SOL_IPV6
-diff -Naur iputils-s20121221.orig/types.h iputils-s20121221/types.h
---- iputils-s20121221.orig/types.h	1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20121221/types.h	2014-01-24 15:32:14.440932610 +0000
-@@ -0,0 +1,14 @@
-+/* This is a small version of <bits/types.h> from glibc
-+ * to take care of type u_char.
-+ *
-+ * Anthony G. Basile <blueness@gentoo.org>
-+ */
-+#ifndef _BITS_TYPES_H
-+#define _BITS_TYPES_H   1
-+
-+typedef unsigned char u_char;
-+typedef unsigned short int u_short;
-+typedef unsigned int u_int;
-+typedef unsigned long int u_long;
-+
-+#endif /* mini <bits/types.h> */

diff --git a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch b/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
deleted file mode 100644
index 6bfcea4..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur iputils-s20121221.orig/tracepath.c iputils-s20121221/tracepath.c
---- iputils-s20121221.orig/tracepath.c	2014-11-20 07:39:59.114108620 -0500
-+++ iputils-s20121221/tracepath.c	2014-11-20 07:40:37.813110381 -0500
-@@ -14,13 +14,13 @@
- #include <unistd.h>
- #include <sys/socket.h>
- #include <linux/types.h>
--#include <linux/errqueue.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <resolv.h>
- #include <sys/time.h>
-+#include <linux/errqueue.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
- #include <limits.h>

diff --git a/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch b/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
deleted file mode 100644
index 554ce9b..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
---- iputils-s20121221.orig/ping.c	2014-01-24 15:05:02.082841335 +0000
-+++ iputils-s20121221/ping.c	2014-01-24 15:17:12.975882203 +0000
-@@ -774,9 +774,16 @@
- 
- 	do {
- 		static struct iovec iov = {outpack, 0};
--		static struct msghdr m = { &whereto, sizeof(whereto),
--						   &iov, 1, &cmsg, 0, 0 };
--		m.msg_controllen = cmsg_len;
-+		static struct msghdr m;
-+
-+		m.msg_name = &whereto;
-+		m.msg_namelen = sizeof(whereto);
-+		m.msg_iov = &iov;
-+		m.msg_iovlen = 1;
-+		m.msg_control = &cmsg;
-+		m.msg_controllen = sizeof(cmsg);
-+		m.msg_flags = 0;
-+
- 		iov.iov_len = cc;
- 
- 		i = sendmsg(icmp_sock, &m, confirm);

diff --git a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch b/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
deleted file mode 100644
index cd1ff55..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur iputils-s20121221.orig/arping.c iputils-s20121221/arping.c
---- iputils-s20121221.orig/arping.c	2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/arping.c	2014-01-23 21:19:57.091268011 +0000
-@@ -16,7 +16,7 @@
- #include <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <linux/if_packet.h>
---- iputils-s20121221.orig/clockdiff.c	2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/clockdiff.c	2014-01-23 21:19:57.093268011 +0000
-@@ -14,7 +14,6 @@
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
- #define TSPTYPES
--#include <protocols/timed.h>
- #include <fcntl.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
---- iputils-s20121221.orig/ping_common.h	2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/ping_common.h	2014-01-23 21:27:07.677292088 +0000
-@@ -7,16 +7,17 @@
- #include <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <sys/uio.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <ctype.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <setjmp.h>
-+#include <linux/param.h>
- 
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
---- iputils-s20121221.orig/rarpd.c	2014-01-24 13:38:46.816551953 +0000
-+++ iputils-s20121221/rarpd.c	2014-01-24 13:36:51.833545524 +0000
-@@ -19,16 +19,17 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
--#include <sys/errno.h>
--#include <sys/fcntl.h>
-+#include <poll.h>
-+#include <errno.h>
-+#include <fcntl.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <linux/if.h>
- #include <linux/if_arp.h>
- #include <netinet/in.h>
- #include <linux/if_packet.h>
- #include <linux/filter.h>
-+#include <sys/types.h>
- 
- int do_reload = 1;
- 
---- iputils-s20121221.orig/tracepath.c	2014-01-24 13:38:46.865551956 +0000
-+++ iputils-s20121221/tracepath.c	2014-01-23 21:19:57.109268012 +0000
-@@ -23,6 +23,7 @@
- #include <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
---- iputils-s20121221.orig/tracepath6.c	2014-01-24 13:38:46.865551956 +0000
-+++ iputils-s20121221/tracepath6.c	2014-01-23 21:20:40.316270428 +0000
-@@ -25,6 +25,7 @@
- #include <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- 
- #ifdef USE_IDN
- #include <idna.h>

diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
deleted file mode 100644
index 66424c8..0000000
--- a/net-misc/iputils/files/iputils-20121221-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:36:16 -0500
-Subject: [PATCH [iputils]] fix handling of CFLAGS
-
-This defaults CFLAGS to -O3 without clobbering settings people have set
-up in the environment already.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2c49940..ecabac3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- # Configuration
- #
- 
--# CC
--CC=gcc
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- # Libraries
-@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
- 
- # -------------------------------------
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
--# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
--CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
--CCOPTOPT=-O3
--GLIBCFIX=-D_GNU_SOURCE
--DEFINES=
-+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
-+CFLAGS?=-O3 -g
-+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-+CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
- 
- FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
-@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
- LDLIBS=$(LDLIB) $(ADDLIB)
- 
- UNAME_N:=$(shell uname -n)
-@@ -132,6 +128,7 @@ all: $(TARGETS)
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
- %.o: %.c
- 	$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
-+LINK.o += $(CFLAGS)
- $(TARGETS): %: %.o
- 	$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
- 
--- 
-1.8.0.2
-

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
deleted file mode 100644
index b6bf7ea..0000000
--- a/net-misc/iputils/files/iputils-20121221-missing-AI_IDN-NI_IDN.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/iputils-20121221-parallel-doc.patch b/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
deleted file mode 100644
index 22bfb88..0000000
--- a/net-misc/iputils/files/iputils-20121221-parallel-doc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4e322b85a12ba3ef5e8118724e3442b2ebb0f6d6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 1 Aug 2012 11:43:34 -0400
-Subject: [PATCH iputils] doc: fix parallel build of html/man pages
-
-The use of the same tempdir prevents building of these files in parallel.
-So build all of them in unique tempdirs so we can do them in parallel.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- doc/Makefile | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 7ec4f1c..4f930a3 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -12,29 +12,40 @@ man: $(MANFILES)
- # lots of some strange temporary junk directories and files.
- # So, scope it to a temporary dir and clean all after each run.
- 
--$(HTMLFILES): index.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html ../$< ; mv *.html ..
--	@-rm -rf tmp.db2html
-+SETUP_TMPDIR = \
-+	t="tmp.db2html.$@"; \
-+	rm -rf $$t; \
-+	mkdir $$t; \
-+	cd $$t
-+CLEAN_TMPDIR = \
-+	cd ..; \
-+	rm -rf $$t
-+
-+MAKE_HTML = \
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	docbook2html ../$<; \
-+	mv *.html ..; \
-+	$(CLEAN_TMPDIR)
- 
-+$(HTMLFILES): index.db
-+	$(MAKE_HTML)
- iputils.html: iputils.db
--	@-rm -rf tmp.db2html
--	@mkdir tmp.db2html
--	@set -e; cd tmp.db2html; docbook2html -u -o html ../$< ; mv html/$@ ..
--	@-rm -rf tmp.db2html
-+	$(MAKE_HTML)
- 
- # docbook2man produces utterly ugly output and I did not find
- # any way to customize this but hacking backend perl script a little.
- # Well, hence...
- 
- $(MANFILES): index.db
--	@-mkdir tmp.db2man
--	@set -e; cd tmp.db2man; nsgmls ../$< | sgmlspl ../docbook2man-spec.pl ;	mv $@ ..
--	@-rm -rf tmp.db2man
-+	@set -e; \
-+	$(SETUP_TMPDIR); \
-+	nsgmls ../$< | sgmlspl ../docbook2man-spec.pl; \
-+	mv $@ ..; \
-+	$(CLEAN_TMPDIR)
- 
- clean:
--	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html tmp.db2man
-+	@rm -rf $(MANFILES) $(HTMLFILES) iputils.html tmp.db2html* tmp.db2man*
- 
- snapshot:
- 	@date "+%y%m%d" > snapshot.db
--- 
-2.3.5
-

diff --git a/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch b/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
deleted file mode 100644
index 08e764d..0000000
--- a/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
---- iputils-s20121221.orig/rdisc.c	2014-01-24 14:59:29.937822762 +0000
-+++ iputils-s20121221/rdisc.c	2014-01-23 21:25:58.760288234 +0000
-@@ -115,26 +114,7 @@
- 
- #define MAXIFS 32
- 
--#if !defined(__GLIBC__) || __GLIBC__ < 2
--/* For router advertisement */
--struct icmp_ra
--{
--	u_char	icmp_type;		/* type of message, see below */
--	u_char	icmp_code;		/* type sub code */
--	u_short	icmp_cksum;		/* ones complement cksum of struct */
--	u_char	icmp_num_addrs;
--	u_char	icmp_wpa;		/* Words per address */
--	short 	icmp_lifetime;
--};
--
--struct icmp_ra_addr
--{
--	__u32	ira_addr;
--	__u32	ira_preference;
--};
--#else
- #define icmp_ra icmp
--#endif
- 
- /* Router constants */
- #define	MAX_INITIAL_ADVERT_INTERVAL	16

diff --git a/net-misc/iputils/files/iputils-20121221-strtod.patch b/net-misc/iputils/files/iputils-20121221-strtod.patch
deleted file mode 100644
index 303acf5..0000000
--- a/net-misc/iputils/files/iputils-20121221-strtod.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/472592
-
-From dd0aa192626f94d08e399fc2a743ee72c50853fb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Apr 2015 20:41:31 -0400
-Subject: [PATCH iputils] ping: fix -i number parsing in locales
-
-Always use #.# format for the -i flag even when the current locale uses
-a different separator.  Locale de_DE which uses #,# normally.
-
-Simple testcase:
-$ make USE_IDN=1
-$ LANG=de_DE.UTF8 ./ping -i 0.5 localhost
-
-Reported-by: Sergey Fionov <fionov@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- ping_common.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/ping_common.c b/ping_common.c
-index 62f53a6..0a37e09 100644
---- a/ping_common.c
-+++ b/ping_common.c
-@@ -269,9 +269,17 @@ void common_options(int ch)
- 		double dbl;
- 		char *ep;
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "C");
-+#endif
-+
- 		errno = 0;
- 		dbl = strtod(optarg, &ep);
- 
-+#ifdef USE_IDN
-+		setlocale(LC_ALL, "");
-+#endif
-+
- 		if (errno || *ep != '\0' ||
- 		    !finite(dbl) || dbl < 0.0 || dbl >= (double)INT_MAX / 1000 - 1.0) {
- 			fprintf(stderr, "ping: bad timing interval\n");
--- 
-2.3.5
-

diff --git a/net-misc/iputils/files/iputils-99999999-openssl.patch b/net-misc/iputils/files/iputils-99999999-openssl.patch
deleted file mode 100644
index 13f5639..0000000
--- a/net-misc/iputils/files/iputils-99999999-openssl.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 321d64b9f94653322e678e34ac214ddb73a71db8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH iputils] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile         |  5 ++++-
- iputils_md5dig.h |  4 +++-
- ping6.c          | 10 ++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 54e5a6d..7147f08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
- 
- # Libgcrypt (for MD5) for ping6 [yes|no|static]
- USE_GCRYPT=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GCRYPT),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GCRYPT),$(LDFLAG_GCRYPT))
- 	DEF_CRYPTO = -DUSE_GCRYPT
- else
-+ifneq ($(USE_CRYPTO),no)
- 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+	DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
- 
- # USE_RESOLV: LIB_RESOLV
-diff --git a/iputils_md5dig.h b/iputils_md5dig.h
-index 4cec866..d6c4d46 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -5,8 +5,10 @@
- # include <stdlib.h>
- # include <gcrypt.h>
- # define IPUTILS_MD5DIG_LEN	16
--#else
-+# define USE_CRYPTO
-+#elif defined(USE_OPENSSL)
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
- 
- #ifdef USE_GCRYPT
-diff --git a/ping6.c b/ping6.c
-index 7085f31..7b7c1af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -324,6 +324,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- 	static __u8 digest[MD5_DIGEST_LENGTH];
- 	static int seq = -1;
- 
-@@ -346,6 +347,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- 			return -1;
- 		return ntohsp((__u16 *)nonce);
- 	}
-+# else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+# endif
- }
- #endif
- 
-@@ -500,6 +505,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
- 
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- 	static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- 	unsigned char *dnptrs[2], **dpp, **lastdnptr;
- 	int n;
-@@ -625,6 +631,10 @@ errexit:
- 	free(idn);
- 	free(name);
- 	exit(1);
-+#else
-+	fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+	exit(3);
-+#endif
- }
- 
- int niquery_option_help_handler(int index, const char *arg)
--- 
-2.3.5
-

diff --git a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch b/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
deleted file mode 100644
index ad34f3b..0000000
--- a/net-misc/iputils/files/iputils-99999999-tftpd-syslog.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 19 Apr 2014 10:39:39 -0400
-Subject: [PATCH iputils] tftpd: fix syslog setup
-
-Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking
-the set*id calls, but would call syslog() before it had called openlog().
-Move the call up earlier to fix that.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tftpd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd.c b/tftpd.c
-index e3af2f4..7ddc8eb 100644
---- a/tftpd.c
-+++ b/tftpd.c
-@@ -109,6 +109,8 @@ int main(int ac, char **av)
- 	register int n = 0;
- 	int on = 1;
- 
-+	openlog("tftpd", LOG_PID, LOG_DAEMON);
-+
- 	/* Sanity. If parent forgot to setuid() on us. */
- 	if (geteuid() == 0) {
- 		if (setgid(65534)) {
-@@ -125,7 +127,6 @@ int main(int ac, char **av)
- 	while (ac-- > 0 && n < MAXARG)
- 		dirs[n++] = *av++;
- 
--	openlog("tftpd", LOG_PID, LOG_DAEMON);
- 	if (ioctl(0, FIONBIO, &on) < 0) {
- 		syslog(LOG_ERR, "ioctl(FIONBIO): %m\n");
- 		exit(1);
--- 
-2.3.5
-

diff --git a/net-misc/iputils/files/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d
deleted file mode 100644
index ef7fc48..0000000
--- a/net-misc/iputils/files/rarpd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for /etc/init.d/rarpd
-
-# You probably want to select the interface for this to listen on.
-# By default it uses loopback which most likely won't help.
-RARPD_IFACE="lo"
-
-# See the rarpd(8) manpage for more info.
-RARPD_OPTS="-b /tftpboot"

diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
deleted file mode 100644
index 27081fc..0000000
--- a/net-misc/iputils/files/rarpd.init.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/rarpd.pid"
-command="/usr/sbin/rarpd"
-# The -d option keeps it from forking.  This way s-s-d can do the fork and
-# set up the pidfile with the right value below.
-command_args="-d ${RARPD_OPTS} ${RARPD_IFACE}"
-start_stop_daemon_args="--background --make-pidfile"
-
-start_pre() {
-	if [ ! -f /etc/ethers ] ; then
-		eerror "Please create /etc/ethers with the following content:"
-		eerror "[MAC address] [name or IP]"
-		return 1
-	fi
-	return 0
-}

diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
deleted file mode 100644
index ffa652d..0000000
--- a/net-misc/iputils/iputils-20151218.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-	inherit git-2
-else
-	SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		!gcrypt? (
-			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-	"
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-PATCHES=(
-	# musl patches
-	"${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch
-	"${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch
-	"${FILESDIR}"/${PN}-20121221-remove-rdisc-glibc-assumption.patch
-	"${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch
-	"${FILESDIR}"/${PN}-20121221-fix-header-order.patch
-	"${FILESDIR}"/${PN}-20121221-missing-AI_IDN-NI_IDN.patch
-
-	"${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	"${FILESDIR}"/${PN}-99999999-openssl.patch #335436
-	"${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch
-	"${FILESDIR}"/${PN}-20121221-makefile.patch
-	"${FILESDIR}"/${PN}-20121221-parallel-doc.patch
-	"${FILESDIR}"/${PN}-20121221-strtod.patch #472592
-)
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch )
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	IPV4_TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	IPV6_TARGETS=(
-		ping6
-		$(usex tracepath 'tracepath6' '')
-		$(usex traceroute 'traceroute6' '')
-	)
-	use ipv6 || IPV6_TARGETS=()
-}
-
-ldflag_resolv() {
-	# See if the system includes a libresolv. #584132
-	echo "main(){}" > "${T}"/resolv.c
-	if ${CC} ${CFLAGS} ${LDFLAGS} "${T}"/resolv.c -lresolv -o "${T}"/resolv 2>/dev/null ; then
-		echo -lresolv
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		USE_GCRYPT=$(usex gcrypt) \
-		USE_CRYPTO=$(usex ssl) \
-		LDFLAG_RESOLV=$(ldflag_resolv) \
-		IPV4_TARGETS="${IPV4_TARGETS[*]}" \
-		IPV6_TARGETS="${IPV6_TARGETS[*]}"
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping $(usex ipv6 'ping6' '')
-	use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL RELNOTES
-
-	use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex ipv6 'bin/ping6' '') \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}

diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
deleted file mode 100644
index 36b0ace..0000000
--- a/net-misc/iputils/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>base-system@gentoo.org</email>
-    <name>Gentoo Base System</name>
-  </maintainer>
-  <use>
-    <flag name="arping">Build and install arping -- tool for sending ARP requests to peers (see also <pkg>net-analyzer/arping</pkg>)</flag>
-    <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
-    <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag>
-    <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
-    <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
-    <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
-    <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
-    <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag>
-    <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
-    <remote-id type="github">iputils/iputils</remote-id>
-  </upstream>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-01-03 18:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-28 19:00 [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/ Aric Belsito
  -- strict thread matches above, loose matches on Subject: below --
2018-01-03 18:43 Aric Belsito
2016-05-29 17:25 Anthony G. Basile
2015-07-19  1:04 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox