Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-misc/iputils/, net-misc/iputils/files/
Date: Sat, 28 Oct 2017 19:00:18
Message-Id: 1509217180.396769d17badb8956a26bba64cd68f39d6dc7fb7.lluixhi@gentoo
1 commit: 396769d17badb8956a26bba64cd68f39d6dc7fb7
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sat Oct 28 18:57:37 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Sat Oct 28 18:59:40 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=396769d1
7
8 net-misc/iputils: version bump to 20171016_pre
9
10 net-misc/iputils/Manifest | 17 ++--
11 ...0150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch | 90 ----------------------
12 .../files/iputils-20150815-scope-delimiter.patch | 14 ----
13 ...0171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch | 70 +++++++++++++++++
14 .../files/iputils-20171016-scope-delimiter.patch | 14 ++++
15 .../files/iputils-99999999-tracepath46.patch | 30 ++++++++
16 net-misc/iputils/files/rarpd.init.d | 1 -
17 net-misc/iputils/iputils-20121221-r1.ebuild | 4 +-
18 net-misc/iputils/iputils-20151218.ebuild | 6 +-
19 ...20160308.ebuild => iputils-20171016_pre.ebuild} | 74 ++++++++++--------
20 10 files changed, 170 insertions(+), 150 deletions(-)
21
22 diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
23 index 856c8ba..29e3eee 100644
24 --- a/net-misc/iputils/Manifest
25 +++ b/net-misc/iputils/Manifest
26 @@ -14,21 +14,22 @@ AUX iputils-20121221-parallel-doc.patch 2042 SHA256 151aed9018976387d4001050b41a
27 AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 WHIRLPOOL 8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee
28 AUX iputils-20121221-remove-rdisc-glibc-assumption.patch 770 SHA256 0639fca129c3e2ca57a7e0f0d3392474665e11f139cfa9362a365b3fca9593b2 SHA512 2ed65a0c0188cf6e06bfb5e3795fa720f7e7040533adbc1ce0c5ded435b823792790890826fc4250a6b2fba16576dc024c50d1faf9598f2fe36aadda77db8a36 WHIRLPOOL a656ae24a99bc5ee6356375be963324eb7fae6aa533e3a572f95bb4695200f2f66d2fa36e037a3c55ce95dcc1643bde4f80326c3cd32ccd53754dde639a1cbd8
29 AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a
30 -AUX iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch 2309 SHA256 1a0f047dd94c631ef5edf6cb78e401d856315ffb9f2130a0a3b5bdd044ce537a SHA512 e3f7e86bf27f9fa2c51ba33c4d83c27e9669861d49af05493736ce0f345ca88743975fedb1d5d1e95d819fccaa47233cb842ea8995d9b7dc1c470dfc867b3c06 WHIRLPOOL 6b6d04e80839616abce28097e7edf702b5e874be40e78aa528a6db0a659656e4c6403eea661e2cb4192b2b4596c3679d6b1e4eaebf9c793435624eb058637336
31 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
32 AUX iputils-20150815-remove-rdisc-glibc-assumption.patch 803 SHA256 328cd59dc3046b078544e7aa7173bbcbc564c887c4cf04cf2b28a9158ef02118 SHA512 a4babd90df642c13c77186f84a5742420118dcf3d351ccd13ae287a166e331b050af62d9ab617af404957286bff8676c6109e813dc64781b571d6f7daea6ce1d WHIRLPOOL aa2d39d7bcf9fabd39cfc1079ed6893ac4d4feaa7074c856af07db569c2f7e369e765c4736a46aca4675b49e4e28b07657ca663546b9d9cafdcda20377579e20
33 -AUX iputils-20150815-scope-delimiter.patch 456 SHA256 7c594216c47f345778cb270a93bdf9da76b05eb44d8452cd916e11c30f96d64b SHA512 2a53d4c1ffcbd50ec5a7adaf4170010e3bcee14031773ebc22a924105d28ed40841f3b275abfed8f51b2dc0376245e0d3fc22a1682fb639f46370406deec6c57 WHIRLPOOL ac046ccb33711d9c53b52f3130f23fdb494ce4c529b8fc1226d493bda444e3034770aec3789a8f275555d53b10ea9e40581189d6dfe0c9b8066151a85dee6a19
34 +AUX iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch 2328 SHA256 54f8db1ec0327a05cb3316a8089f506a249d42dac8420dcde5ecf18acc04bef8 SHA512 d2b3c68a9297e22ab033b5126adabe397201f6a84d6f0105233c20746b0826e6ed7318bba30f637ad4f3a19e1812a2a5a02c2eaafcc824b445f58518b8b1d408 WHIRLPOOL 4f34a35c8918951aaf0916f724901d4f9afc98a10a28e28f72f76fd7686610007c8c216ed794f161962e4f9588bc52a15e094cab2c17b4c1decfa8210026e0b5
35 +AUX iputils-20171016-scope-delimiter.patch 582 SHA256 850b3c699ec0dbb01ce90b13981d5670ea9af00c2c3af6390289e9f3182f5f01 SHA512 313d47f18dcd1320de59c9bde0ee8baa2817c1145b5ee9aa6c6c6663a0072a2525589c0c2d282db2726d63a81716926a4ce2d841ffec2cc35229174c75e237ec WHIRLPOOL ee3d0f1296931b6dcdf4577f91b96acf4277bea49d85926ed189aacb11856d65d348c0a200a588c44a02e62c21bea33d1f4ae96b597b23f7328059f1c83fef64
36 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
37 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
38 +AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
39 AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf
40 -AUX rarpd.init.d 590 SHA256 a2ba31119ad6b5ea5cd8932a28aeac6621979cc001f00cfeed2900d5a3087799 SHA512 16d9276aa0f7c5fc808123d4344e9884a436c0cb7cfab74c283cdccb6312ad3403e83a1691da75671515511cfab5f1d4063fa5adc4c071034d240e3be5b11666 WHIRLPOOL c3b38a2bb65ebbb001cef510b6ecba9b9ed2147e95aacd4dd5fb51a626a6437bc7462729140c89e37f131ae4005638e557ef38abc355e9ca01c884633e73f2d3
41 -DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf
42 +AUX rarpd.init.d 583 SHA256 4b3efb6723a0c0b9ef7988ed9d3100ece49180483aa51fb69cf055e5d1565391 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada WHIRLPOOL aa25eb5ca849825842d9968ff0928552bb6070b1e8435e74b1af579c6382332941ae4f99c02c3a3eedd34474814e74733d9f15e4c88583aeb06003d508338e48
43 +DIST iputils-20171016_pre.tar.gz 195254 SHA256 2f1870633baeb999fe214a8958353f291caf3cedac242862930d41c760bf1748 SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 WHIRLPOOL 76600ed31bfa10535c7aa6e33ab5019db8814c55ca9941a3857300bccb89650cdc8edea9d654103151bc5f54643f5618c9261d7ba5fa5c14e8f6293bca340db7
44 +DIST iputils-manpages-20171016_pre.tar.xz 29764 SHA256 f23e5bee1d59c5b8cabc47faab5d175de1c5b663379108ec70e75d2a74888883 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 WHIRLPOOL a80cfa73dd326dedff76de06b3939f631ff017e3bd5cbeb0f988eb27ad997c62c2be1dc645f3e415b7081942a0cbf9139729c998c77b47c989ccd61ad272cf6e
45 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
46 DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
47 DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
48 DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7
49 -DIST iputils-s20160308-manpages.tar.xz 22684 SHA256 e21ef842d2eb4fa21f64cb872101bc9f979d24127fb680247d4a95ffc94a3958 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac WHIRLPOOL 2675551b615efdf54a77bcb1dbe22c89b1ae5cd783c7bf33c703b81f54239096c1a7e13e7c8d6abd8b4ed5b0cbbd6f3b59d4102279c8cfb6f0a0bf6e070aab93
50 -EBUILD iputils-20121221-r1.ebuild 3189 SHA256 0da1bfe9752732d2d3a27c074182115934936de7631517843c17fb0aec82ba04 SHA512 b87f51cfc9a86688fe7a2fa1c06b5e9cc8af143e4eb7e2ca0f029d8b040e4130ec50a35ba1e7c11eb058f92fbfd683fed1c8e30071a8119cf6aeda0f0487bccb WHIRLPOOL 8ee7802aee88921186a2d87034f29ecc3839f9fea643ae03bfe1fe67783f8a9acaf61e5320e6ad2563f61f3d884486c838ff85a2b73e479e92fcf88f78d2fda3
51 -EBUILD iputils-20151218.ebuild 4317 SHA256 943968d4e3cb11933f255dbae747fb0bb441cc3ef89163358da1ad674dc45355 SHA512 8b8f5a887f8dad95bf752523d60729112de1f12d768450a84c6d1479a2a25697a13bba464b10abcf0cd54ebed8c0785ea0ff6db9b672309a9706895f2754d30e WHIRLPOOL 65fc68c9bc8a81b42c633e660c36686aa5c33710166c04839e8cd145b112147a1e52aafe0762004e349330f844a01f37246be354005f95ec8513e67b5d8d7185
52 -EBUILD iputils-20160308.ebuild 4029 SHA256 1c4d13dc26f101e776c07a6eda64fc1169b5900d9e1f6184ac5b3ed559bf05d6 SHA512 422f88a90c76a4fb7d955a4333afbe7ed5ac46ea6ea1967d80494316e7bed7358e3ef50229d2d2adb86a2346a5dbbd60102a5b443c975366e4bb9c183d9642a0 WHIRLPOOL c192eb8dbfe67159e4dec5d00dca3b3cb581e78dfc9e33ed6f328d035c999b33da2d61f1ed8ecbaf11f9096dab60564474d22df55b627f49c3fb47126b17653e
53 +EBUILD iputils-20121221-r1.ebuild 3200 SHA256 c8366b5fd040eb4224264cb0fca20d17bf89a27658d8196ed5e461c31fc48ce8 SHA512 545f22070d3d9fab6e284247046e3eb65d3a80f19ca35f6ef55a1839149893ebd7a5c04ec5f63ef28e150d52f9a8ec227e43417e2bd595bd6fec9545ebe15a36 WHIRLPOOL cd71680060b158c67a32846d8911b7d348ab04eb6235ce3d752c8a4c3bccfaee113f2926cfdecc4374779e934e66f6dc17a13fa9c79ce20ab5dd5d0469eaf22b
54 +EBUILD iputils-20151218.ebuild 4329 SHA256 fd5dcdbd604f900d2829a8c4ce508825a7f429359459506cf9f7a5aae8a466ad SHA512 a270c3377db404b44bb5b38b220f6ba2c05f51e0807cf998741ef7fa60a929d566121e09fa0a8b6b835ae58f84f322b990268525ee230a254d14792f1c8edafa WHIRLPOOL c2a22e6dfe5bc9beb91efcd97061e08ab83e7356a5a2f8f8e0579925110396afd98ad4ed045296eef4b87cd45104a7d6ea9d06bcbb04c6388bcd92f93acf859a
55 +EBUILD iputils-20171016_pre.ebuild 4236 SHA256 a1e0877f390ef0c051e1f19b3d78149d577002e978270d270e569f4dfef90720 SHA512 86a987d028e52638cec8fceedc2fcdfb4b503378fa1a4e0cb8aa10b28ec30ebca9c318ceab60c9c3cfc74f51642dc63bd529dbe86542722a0aa2d993e981a0dd WHIRLPOOL 8cf1c251e369fba0350b7a92e9c0ad6291de8d43f7582072c474ebf69618eeac45ec3e05f54bf25ce22ee75fa09f2c79950ff41c82ef5206ea428ebcb6bd124e
56 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
57
58 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
59 deleted file mode 100644
60 index 19fadf4..0000000
61 --- a/net-misc/iputils/files/iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
62 +++ /dev/null
63 @@ -1,90 +0,0 @@
64 -diff -Naur iputils-s20150815.orig/arping.c iputils-s20150815/arping.c
65 ---- iputils-s20150815.orig/arping.c 2015-08-15 07:07:28.000000000 -0700
66 -+++ iputils-s20150815/arping.c 2016-03-12 14:19:28.045630934 -0800
67 -@@ -45,6 +45,13 @@
68 - #ifdef USE_IDN
69 - #include <idna.h>
70 - #include <locale.h>
71 -+
72 -+#ifndef AI_IDN
73 -+#define AI_IDN 0x0040
74 -+#endif
75 -+#ifndef AI_CANONIDN
76 -+#define AI_CANONIDN 0x0080
77 -+#endif
78 - #endif
79 -
80 - #include "SNAPSHOT.h"
81 -diff -Naur iputils-s20150815.orig/ping.h iputils-s20150815/ping.h
82 ---- iputils-s20150815.orig/ping.h 2015-08-15 07:07:28.000000000 -0700
83 -+++ iputils-s20150815/ping.h 2016-03-12 14:19:51.634859603 -0800
84 -@@ -38,6 +38,17 @@
85 - #include <locale.h>
86 - #include <idna.h>
87 - #include <stringprep.h>
88 -+
89 -+#ifndef AI_IDN
90 -+#define AI_IDN 0x0040
91 -+#endif
92 -+#ifndef AI_CANONIDN
93 -+#define AI_CANONIDN 0x0080
94 -+#endif
95 -+#ifndef NI_IDN
96 -+#define NI_IDN 32
97 -+#endif
98 -+
99 - #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
100 - #define getnameinfo_flags NI_IDN
101 - #else
102 -diff -Naur iputils-s20150815.orig/tracepath.c iputils-s20150815/tracepath.c
103 ---- iputils-s20150815.orig/tracepath.c 2015-08-15 07:07:28.000000000 -0700
104 -+++ iputils-s20150815/tracepath.c 2016-03-12 14:20:24.124174547 -0800
105 -@@ -29,6 +29,17 @@
106 - #include <idna.h>
107 - #include <locale.h>
108 -
109 -+#ifndef AI_IDN
110 -+#define AI_IDN 0x0040
111 -+#endif
112 -+#ifndef AI_CANONIDN
113 -+#define AI_CANONIDN 0x0080
114 -+#endif
115 -+#ifndef NI_IDN
116 -+#ifndef NI_IDN
117 -+#define NI_IDN 32
118 -+#endif
119 -+
120 - #define getnameinfo_flags NI_IDN
121 - #else
122 - #define getnameinfo_flags 0
123 -diff -Naur iputils-s20150815.orig/tracepath6.c iputils-s20150815/tracepath6.c
124 ---- iputils-s20150815.orig/tracepath6.c 2015-08-15 07:07:28.000000000 -0700
125 -+++ iputils-s20150815/tracepath6.c 2016-03-12 14:19:00.838370686 -0800
126 -@@ -30,6 +30,13 @@
127 - #ifdef USE_IDN
128 - #include <idna.h>
129 - #include <locale.h>
130 -+
131 -+#ifndef AI_IDN
132 -+#define AI_IDN 0x0040
133 -+#endif
134 -+#ifndef NI_IDN
135 -+#define NI_IDN 32
136 -+#endif
137 - #endif
138 -
139 - #ifndef SOL_IPV6
140 -diff -Naur iputils-s20150815.orig/traceroute6.c iputils-s20150815/traceroute6.c
141 ---- iputils-s20150815.orig/traceroute6.c 2015-08-15 07:07:28.000000000 -0700
142 -+++ iputils-s20150815/traceroute6.c 2016-03-12 14:19:00.839370696 -0800
143 -@@ -250,6 +250,10 @@
144 - #include <idna.h>
145 - #include <locale.h>
146 -
147 -+#ifndef NI_IDN
148 -+#define NI_IDN 32
149 -+#endif
150 -+
151 - #define getnameinfo_flags NI_IDN
152 - #else
153 - #define getnameinfo_flags 0
154
155 diff --git a/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch b/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch
156 deleted file mode 100644
157 index bb1f1b6..0000000
158 --- a/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch
159 +++ /dev/null
160 @@ -1,14 +0,0 @@
161 -diff -Naurw iputils-s20150815/ping.c iputils-s20150815.new/ping.c
162 ---- iputils-s20150815/ping.c 2015-08-15 07:07:28.000000000 -0700
163 -+++ iputils-s20150815.new/ping.c 2015-10-05 14:49:33.300065816 -0700
164 -@@ -80,6 +80,10 @@
165 - #define NROUTES 9 /* number of record route slots */
166 - #define TOS_MAX 255 /* 8-bit TOS field */
167 -
168 -+#ifndef SCOPE_DELIMITER
169 -+# define SCOPE_DELIMITER '%'
170 -+#endif
171 -+
172 - static const int max_ping4_packet = 0x10000;
173 -
174 - static int ts_type;
175
176 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
177 new file mode 100644
178 index 0000000..94338cc
179 --- /dev/null
180 +++ b/net-misc/iputils/files/iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
181 @@ -0,0 +1,70 @@
182 +diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/arping.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/arping.c
183 +--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/arping.c 2017-10-16 01:44:15.000000000 -0700
184 ++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/arping.c 2017-10-28 11:50:51.803318287 -0700
185 +@@ -45,6 +45,13 @@
186 + #ifdef USE_IDN
187 + #include <idna.h>
188 + #include <locale.h>
189 ++
190 ++#ifndef AI_IDN
191 ++#define AI_IDN 0x0040
192 ++#endif
193 ++#ifndef AI_CANONIDN
194 ++#define AI_CANONIDN 0x0080
195 ++#endif
196 + #endif
197 +
198 + #include "SNAPSHOT.h"
199 +diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.h iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.h
200 +--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.h 2017-10-16 01:44:15.000000000 -0700
201 ++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.h 2017-10-28 11:51:15.378317864 -0700
202 +@@ -38,6 +38,17 @@
203 + #include <locale.h>
204 + #include <idna.h>
205 + #include <stringprep.h>
206 ++
207 ++#ifndef AI_IDN
208 ++#define AI_IDN 0x0040
209 ++#endif
210 ++#ifndef AI_CANONIDN
211 ++#define AI_CANONIDN 0x0080
212 ++#endif
213 ++#ifndef NI_IDN
214 ++#define NI_IDN 32
215 ++#endif
216 ++
217 + #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
218 + #define getnameinfo_flags NI_IDN
219 + #else
220 +diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/tracepath.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/tracepath.c
221 +--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/tracepath.c 2017-10-16 01:44:15.000000000 -0700
222 ++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/tracepath.c 2017-10-28 11:53:11.880315778 -0700
223 +@@ -30,6 +30,14 @@
224 + #ifdef USE_IDN
225 + #include <idna.h>
226 + #include <locale.h>
227 ++
228 ++#ifndef AI_IDN
229 ++#define AI_IDN 0x0040
230 ++#endif
231 ++#ifndef NI_IDN
232 ++#define NI_IDN 32
233 ++#endif
234 ++
235 + #define getnameinfo_flags NI_IDN
236 + #else
237 + #define getnameinfo_flags 0
238 +diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/traceroute6.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/traceroute6.c
239 +--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/traceroute6.c 2017-10-16 01:44:15.000000000 -0700
240 ++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/traceroute6.c 2017-10-28 11:53:39.517315283 -0700
241 +@@ -247,6 +247,10 @@
242 + #include <idna.h>
243 + #include <locale.h>
244 +
245 ++#ifndef NI_IDN
246 ++#define NI_IDN 32
247 ++#endif
248 ++
249 + #define getnameinfo_flags NI_IDN
250 + #else
251 + #define getnameinfo_flags 0
252
253 diff --git a/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch b/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch
254 new file mode 100644
255 index 0000000..a73bc97
256 --- /dev/null
257 +++ b/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch
258 @@ -0,0 +1,14 @@
259 +diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c
260 +--- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c 2017-10-16 01:44:15.000000000 -0700
261 ++++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c 2017-10-28 11:48:03.198321306 -0700
262 +@@ -77,6 +77,10 @@
263 + #define NROUTES 9 /* number of record route slots */
264 + #define TOS_MAX 255 /* 8-bit TOS field */
265 +
266 ++#ifndef SCOPE_DELIMITER
267 ++# define SCOPE_DELIMITER '%'
268 ++#endif
269 ++
270 + static int ts_type;
271 + static int nroute = 0;
272 + static __u32 route[10];
273
274 diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
275 new file mode 100644
276 index 0000000..20d017b
277 --- /dev/null
278 +++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
279 @@ -0,0 +1,30 @@
280 +From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
281 +From: Thomas Deutschmann <whissi@g.o>
282 +Date: Thu, 19 Oct 2017 17:38:20 +0200
283 +Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
284 + `tracepath6`
285 +
286 +---
287 + tracepath.c | 6 ++++++
288 + 1 file changed, 6 insertions(+)
289 +
290 +diff --git a/tracepath.c b/tracepath.c
291 +index b0eb911..d2a6edf 100644
292 +--- a/tracepath.c
293 ++++ b/tracepath.c
294 +@@ -394,6 +394,12 @@ int main(int argc, char **argv)
295 + setlocale(LC_ALL, "");
296 + #endif
297 +
298 ++ /* Support being called using `tracepath4` or `tracepath6` symlinks */
299 ++ if (argv[0][strlen(argv[0])-1] == '4')
300 ++ hints.ai_family = AF_INET;
301 ++ else if (argv[0][strlen(argv[0])-1] == '6')
302 ++ hints.ai_family = AF_INET6;
303 ++
304 + while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
305 + switch(ch) {
306 + case '4':
307 +--
308 +2.14.3
309 +
310
311 diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
312 index bf8cf1e..27081fc 100644
313 --- a/net-misc/iputils/files/rarpd.init.d
314 +++ b/net-misc/iputils/files/rarpd.init.d
315 @@ -1,7 +1,6 @@
316 #!/sbin/openrc-run
317 # Copyright 1999-2015 Gentoo Foundation
318 # Distributed under the terms of the GNU General Public License v2
319 -# $Id$
320
321 pidfile="/var/run/rarpd.pid"
322 command="/usr/sbin/rarpd"
323
324 diff --git a/net-misc/iputils/iputils-20121221-r1.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild
325 index 7cd1500..9bcdd13 100644
326 --- a/net-misc/iputils/iputils-20121221-r1.ebuild
327 +++ b/net-misc/iputils/iputils-20121221-r1.ebuild
328 @@ -1,4 +1,4 @@
329 -# Copyright 1999-2015 Gentoo Foundation
330 +# Copyright 1999-2017 Gentoo Foundation
331 # Distributed under the terms of the GNU General Public License v2
332
333 # For released versions, we precompile the man/html pages and store
334 @@ -21,7 +21,7 @@ fi
335 DESCRIPTION="Network monitoring tools including ping and ping6"
336 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
337
338 -LICENSE="BSD-4"
339 +LICENSE="BSD GPL-2+ rdisc"
340 SLOT="0"
341 IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
342
343
344 diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
345 index 60aff35..ffa652d 100644
346 --- a/net-misc/iputils/iputils-20151218.ebuild
347 +++ b/net-misc/iputils/iputils-20151218.ebuild
348 @@ -1,4 +1,4 @@
349 -# Copyright 1999-2016 Gentoo Foundation
350 +# Copyright 1999-2017 Gentoo Foundation
351 # Distributed under the terms of the GNU General Public License v2
352
353 # For released versions, we precompile the man/html pages and store
354 @@ -21,9 +21,9 @@ fi
355 DESCRIPTION="Network monitoring tools including ping and ping6"
356 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
357
358 -LICENSE="BSD-4"
359 +LICENSE="BSD GPL-2+ rdisc"
360 SLOT="0"
361 -IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
362 +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
363
364 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
365 idn? ( net-dns/libidn[static-libs(+)] )
366
367 diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
368 similarity index 64%
369 rename from net-misc/iputils/iputils-20160308.ebuild
370 rename to net-misc/iputils/iputils-20171016_pre.ebuild
371 index 4745980..d681f2c 100644
372 --- a/net-misc/iputils/iputils-20160308.ebuild
373 +++ b/net-misc/iputils/iputils-20171016_pre.ebuild
374 @@ -1,31 +1,33 @@
375 -# Copyright 1999-2016 Gentoo Foundation
376 +# Copyright 1999-2017 Gentoo Foundation
377 # Distributed under the terms of the GNU General Public License v2
378
379 # For released versions, we precompile the man/html pages and store
380 # them in a tarball on our mirrors. This avoids ugly issues while
381 -# building stages, and when the jade/sgml packages are broken (which
382 -# seems to be more common than would be nice).
383 -# Required packages for doc generation:
384 -# app-text/docbook-sgml-utils
385 +# building stages, and reduces depedencies.
386 +# To regenerate man/html pages emerge iputils-99999999[doc] with
387 +# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
388
389 -EAPI=5
390 +EAPI="6"
391 +
392 +inherit flag-o-matic toolchain-funcs fcaps
393 +
394 +MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
395
396 -inherit flag-o-matic eutils toolchain-funcs fcaps
397 if [[ ${PV} == "99999999" ]] ; then
398 EGIT_REPO_URI="https://github.com/iputils/iputils.git"
399 inherit git-r3
400 else
401 - SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
402 - https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
403 + SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
404 + https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
405 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
406 fi
407
408 DESCRIPTION="Network monitoring tools including ping and ping6"
409 HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
410
411 -LICENSE="BSD-4"
412 +LICENSE="BSD GPL-2+ rdisc"
413 SLOT="0"
414 -IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
415 +IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
416
417 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
418 idn? ( net-dns/libidn[static-libs(+)] )
419 @@ -43,32 +45,33 @@ RDEPEND="arping? ( !net-misc/arping )
420 !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
421 DEPEND="${RDEPEND}
422 static? ( ${LIB_DEPEND} )
423 - virtual/os-headers"
424 + virtual/os-headers
425 +"
426 if [[ ${PV} == "99999999" ]] ; then
427 - DEPEND+="
428 - app-text/openjade
429 - dev-perl/SGMLSpm
430 - app-text/docbook-sgml-dtd
431 - app-text/docbook-sgml-utils
432 + DEPEND+="app-text/docbook-xml-dtd:4.2
433 + app-text/docbook-xml-dtd:4.5
434 + app-text/docbook-xsl-stylesheets
435 + dev-libs/libxslt:0
436 "
437 fi
438
439 REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
440
441 -S=${WORKDIR}/${PN}-s${PV}
442 +[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
443
444 -PATCHES=(
445 - # musl patches
446 - "${FILESDIR}/${PN}-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch"
447 - "${FILESDIR}/${PN}-20150815-remove-rdisc-glibc-assumption.patch"
448 - "${FILESDIR}/${PN}-20150815-scope-delimiter.patch"
449 +S="${WORKDIR}/${PN}-${MY_COMMIT}"
450
451 - "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
452 +PATCHES=(
453 + "${FILESDIR}"/${PN}-99999999-tracepath46.patch
454 + "${FILESDIR}"/${PN}-20150815-remove-rdisc-glibc-assumption.patch
455 + "${FILESDIR}"/${PN}-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch
456 + "${FILESDIR}"/${PN}-20171016-scope-delimiter.patch
457 )
458
459 src_prepare() {
460 - epatch ${PATCHES[@]}
461 - use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
462 + use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
463 +
464 + default
465 }
466
467 src_configure() {
468 @@ -80,7 +83,6 @@ src_configure() {
469 )
470 if use ipv6 ; then
471 TARGETS+=(
472 - $(usex tracepath 'tracepath6' '')
473 $(usex traceroute 'traceroute6' '')
474 )
475 fi
476 @@ -110,7 +112,9 @@ src_compile() {
477 ${myconf[@]}
478
479 if [[ ${PV} == "99999999" ]] ; then
480 - emake html man
481 + emake man
482 +
483 + use doc && emake html
484 fi
485 }
486
487 @@ -131,8 +135,14 @@ src_install() {
488
489 into /usr
490
491 + if use tracepath ; then
492 + dosbin tracepath
493 + doman doc/tracepath.8
494 + dosym tracepath /usr/sbin/tracepath4
495 + fi
496 +
497 local u
498 - for u in clockdiff rarpd rdisc tftpd tracepath ; do
499 + for u in clockdiff rarpd rdisc tftpd ; do
500 if use ${u} ; then
501 case ${u} in
502 clockdiff) dobin ${u};;
503 @@ -143,7 +153,7 @@ src_install() {
504 done
505
506 if use tracepath && use ipv6 ; then
507 - dosbin tracepath6
508 + dosym tracepath /usr/sbin/tracepath6
509 dosym tracepath.8 /usr/share/man/man8/tracepath6.8
510 fi
511
512 @@ -157,9 +167,9 @@ src_install() {
513 newconfd "${FILESDIR}"/rarpd.conf.d rarpd
514 fi
515
516 - dodoc INSTALL RELNOTES
517 + dodoc INSTALL.md
518
519 - use doc && dohtml doc/*.html
520 + use doc && dodoc doc/*.html
521 }
522
523 pkg_postinst() {