commit: 8b20a73882bc475f8dcd68c1513e00a7feb26f8e Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Tue Dec 6 20:45:15 2016 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Tue Dec 6 20:45:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8b20a738
net-misc/iputils: Add 20160308 Sync with upstream Remove old patches Add missing patches to 20150815 Drop r99 postfix net-misc/iputils/Manifest | 18 +- .../iputils/files/iputils-20100418-makefile.patch | 35 ---- .../files/iputils-20100418-printf-size.patch | 62 ------ .../files/iputils-20101006-owl-pingsock.diff | 224 --------------------- ...0150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch | 90 +++++++++ .../files/iputils-20150815-nonroot-floodping.patch | 11 + ...ls-20150815-remove-rdisc-glibc-assumption.patch | 30 +++ .../files/iputils-20150815-scope-delimiter.patch | 14 ++ net-misc/iputils/files/rarpd.conf.d | 8 + net-misc/iputils/files/rarpd.init.d | 20 ++ ...21221-r99.ebuild => iputils-20121221-r1.ebuild} | 20 +- ...20151218-r99.ebuild => iputils-20151218.ebuild} | 31 ++- ...20151218-r99.ebuild => iputils-20160308.ebuild} | 85 ++++---- net-misc/iputils/metadata.xml | 2 + 14 files changed, 271 insertions(+), 379 deletions(-) diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index f3900c4..2cc2101 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,9 +1,6 @@ AUX 021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38 WHIRLPOOL e5390a41b0764d78cda651dd6fff2ebd4f206dc6f5b34da370c19cee7d44f373035fc1efa2bf90924b5a06ca48f344f80a2c902abe04eb588d01e0a9d59bf79d AUX iputils-20071127-nonroot-floodping.patch 497 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8 WHIRLPOOL 1f880978cf70188d0d59e79396f8c5962655c00cbf7f7c7adb800316dea1b6748ddbc788681c9831edf0fbb1153e85b5ca35e0e3c131b0a5b4884fa511119c0c -AUX iputils-20100418-makefile.patch 974 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b SHA512 c3c9096cd2587e39afdd0a78291a4f67249e2fc75c303cd648a795f7c88dc7e9e2c27f3f56fe6d7d40bdcb0d179dfd35f1c991ba8fd3524149f8cbb94d9ef0ca WHIRLPOOL b4fa577f4b52792165abda924a1980fb1101c7f5a15714b4a9647535e5be622c54e6ef0f731212a74b1a6fc1ddfcf54f98e5c0a0c540e0113823e7646dd6df8a -AUX iputils-20100418-printf-size.patch 1658 SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc SHA512 556237d39043815f196b0f22ec552bfb52ad2d45b2faf67e26712361bc11acd21cec42b8241ccf72778b421b9f456a37e9466dbfc03c0df2be1e1bb5ae48a92e WHIRLPOOL 80d03f09a6b023413845f5fe12e6decd87e70c143ad79215d66b1fd29c42bf7b61580addac910dd2134c9d4bf41432f21c7a63184e76aa1bdd936621da6b12d6 AUX iputils-20100418-so_mark.patch 597 SHA256 3c0c3e93d3b458a02f856be3681c2dd5bfb18933e4752e90dc277cdd353b3576 SHA512 453ef3f8c53e2c2cef54f19219b892e51a83a6109f73a4f10712aec729509f02e6b830ab7ca85843a70f3d9c9860f084b256290f638741d573a5205ba89fe469 WHIRLPOOL 502e9ee110555644fd7d19d64afba3d2777844faca6fe0111b4b7356e3262c011b8de13475db1e70dff9225e3883d7e3e27d1f96f240a80d4c5c9ab0a29c9560 -AUX iputils-20101006-owl-pingsock.diff 6390 SHA256 1425efd6d30e6c9682569ff1de731922351048f81df44a2ebad30cca85fc51c9 SHA512 0e609aa8088572244a57d719124df2719d5b0a3b37861afb08aa434192c1801e03617254b7caca8f47749cf72c2da8c52f007eb0c136a64f5abd44ad9960cc1d WHIRLPOOL dc9824a7761fd384e8a5c991d02201cb18b4aeb666a0d83ca18ce0e59216a46831a219629d796beacb048fb647841d178d64f478288b8e9d2766e10f2d129a10 AUX iputils-20121221-add-bits_types_h.patch 3092 SHA256 e198400f387fa4140c7c6a75089b570ea24d044cf6fd55b1f37f239bb018969e SHA512 666c1711c5a5c829246a0f9a3d9afbb0ceb43e172b907230b856dbc0a330814d0c562e1894ee3b6051c01b54469fafd429c4236954967691b12744cacc844dab WHIRLPOOL 0014a8394f4e7bc002d572d8eeec3cb49809a172eaf93b3f62d4b91b741c7b8bd36b4b8b830ed16b6972102e9a3c4c730b50039d6731c0abb6203aeab44d33ba 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 @@ -17,12 +14,21 @@ 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-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df +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 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 3921 SHA256 6ea73672ced574248ac284a235626bad38844273f236de4469fc872e75e7332f SHA512 dc14aac96854bd1441d3f92118684b5347175b3bf44bda2059440533d45078a8c1c63bf492e0f2e5ad58d9a30dc70b879eb34d7d46f03fc2d32b048f10a996c3 WHIRLPOOL f39b5e77bac34e6291b38d4a750973107db94075de45a056a8bd1595bc72c8dc886c7bd279a090165bfa7b702864a1392d573f465301c21dddf5c14ee0f9a91b -MISC metadata.xml 1540 SHA256 fdbee938f89b4f304e289907c17fc980782f8587c45d71eb2dd66f3dad9527cc SHA512 2843d252dc4378895ca5e3e31c1f04d1f2906cd1fd8ecb28deea031c2ba7fcc99d17b5474b78a1ae30ec8929cecd44afa1aa7582b37913e28ad419a95137d74f WHIRLPOOL 16d666eaff68f7e5c216069d1578ee29c2801848f0e87cbd9ebf446dc16a5466d30b510c024f590f0c7a65b56bbe7098e56e0ab8c6e12a002977708ba6015031 +DIST iputils-s20160308-manpages.tar.xz 22684 SHA256 e21ef842d2eb4fa21f64cb872101bc9f979d24127fb680247d4a95ffc94a3958 SHA512 fe55ee334f1a99c6d93f4d18d97666d307676ced77175b73139f888af8f4f0ddc0f1d0511ab71d234f57909def606bf5c3aede2db28a0f73eb5628b9c8e16cac WHIRLPOOL 2675551b615efdf54a77bcb1dbe22c89b1ae5cd783c7bf33c703b81f54239096c1a7e13e7c8d6abd8b4ed5b0cbbd6f3b59d4102279c8cfb6f0a0bf6e070aab93 +EBUILD iputils-20121221-r1.ebuild 3196 SHA256 af2c573335d821b3ca2ae75a0b0530a6ce8bfc9111bc2e3ef5216708d5c96102 SHA512 5e0f984269d39be5f715d3252e412feaa41323c003fb918e6c10911e93227f8182da0999e580f095f3fa0cbb5a0db554effd36f3360bd1de41ed1fa001e1e22e WHIRLPOOL b5b7e44d923108b281cb6a52d4ab3ecb427346645bd4ee2cb80bd2e2c77de3b67a68b1a1bb5a939f75ffee68e55969ffbcb39892bfcbf2674307255c18ffe6f1 +EBUILD iputils-20151218.ebuild 4324 SHA256 77336ebada1a0a0e147bf0859faad70189c0f59db8aa439a41db21ed220a73f7 SHA512 5ac932e135dac45b1f1ade1701a862abae50c5aaf56300a218bdb6a37013c1e956dbdcf7b4e542f57b138bc55ec2e9b9131da6c17a2d620f41c24ff71af954d8 WHIRLPOOL 39d0f222f9a92a695ad47006b910e35beaf111001878ece5b76e32ccf940d62c16de8ef5d28afe1a69ba4371cf3f814d2f1d6bc8d67576b8b1df52c6811e01d5 +EBUILD iputils-20160308.ebuild 4036 SHA256 646a4a6646f84af84094505906056d95858503a810ceda021bfdba370b1ce5e7 SHA512 258edcbdfbe87f0d8d858a7b1ecb4e8f51d1ff3597b7cebd8a9dc6e3e12af7ac53347b4f0743752c943f40056640fa99831c8e7574730cf6d9130e79093651eb WHIRLPOOL bdf699872d853af2d3a292d1f24cf8a5bd7ed112c54fa0d41bfd2c6c079a9b10a2f3917eb7cb63dd8050dc75a6494a5495baeebc327be689258d48c4beea246d +MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e diff --git a/net-misc/iputils/files/iputils-20100418-makefile.patch b/net-misc/iputils/files/iputils-20100418-makefile.patch deleted file mode 100644 index 50a0e81..0000000 --- a/net-misc/iputils/files/iputils-20100418-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile -+++ Makefile -@@ -1,20 +1,17 @@ - # Path to parent kernel include files directory - LIBC_INCLUDE=/usr/include - --DEFINES= -- - #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) - LDLIBS= --ADDLIB= - - #options if you compile with libc5, and without a bind>=4.9.4 libresolv - # NOT AVAILABLE. Please, use libresolv. - --CC=gcc - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror --CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g --CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) -+CFLAGS ?= -O2 -g -+CFLAGS += -Wstrict-prototypes -Wall -+CPPFLAGS += -D_GNU_SOURCE - - IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd - IPV6_TARGETS=tracepath6 traceroute6 ping6 -@@ -35,7 +32,7 @@ - rdisc_srv: rdisc_srv.o - - rdisc_srv.o: rdisc.c -- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c - - - check-kernel: diff --git a/net-misc/iputils/files/iputils-20100418-printf-size.patch b/net-misc/iputils/files/iputils-20100418-printf-size.patch deleted file mode 100644 index edde65b..0000000 --- a/net-misc/iputils/files/iputils-20100418-printf-size.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6ccd3b91c18d8b13bc468ef962a9ef9dfc6c4515 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sat, 14 Aug 2010 01:16:42 -0400 -Subject: [PATCH] tracepath: re-use printf return in print_host - -The printf funcs take an int for field widths, not a size_t. Also, since -the printf funcs already return the length of chars displayed, use that -value instead of re-calculating the length with strlen. - -Signed-off-by: Mike Frysinger <[email protected]> ---- - tracepath.c | 11 ++++------- - tracepath6.c | 11 ++++------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/tracepath.c b/tracepath.c -index 81c22e9..ca84a69 100644 ---- a/tracepath.c -+++ b/tracepath.c -@@ -68,13 +68,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- size_t plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); -diff --git a/tracepath6.c b/tracepath6.c -index 5cc7424..5c2db8f 100644 ---- a/tracepath6.c -+++ b/tracepath6.c -@@ -80,13 +80,10 @@ void data_wait(int fd) - - void print_host(const char *a, const char *b, int both) - { -- size_t plen = 0; -- printf("%s", a); -- plen = strlen(a); -- if (both) { -- printf(" (%s)", b); -- plen += strlen(b) + 3; -- } -+ int plen; -+ plen = printf("%s", a); -+ if (both) -+ plen += printf(" (%s)", b); - if (plen >= HOST_COLUMN_SIZE) - plen = HOST_COLUMN_SIZE - 1; - printf("%*s", HOST_COLUMN_SIZE - plen, ""); --- -1.7.1.1 - diff --git a/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff b/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff deleted file mode 100644 index 86c85bc..0000000 --- a/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff +++ /dev/null @@ -1,224 +0,0 @@ -http://openwall.info/wiki/people/segoon/ping - ---- iputils-s20101006/ping.c -+++ iputils-s20101006/ping.c -@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi - int optlen = 0; - int settos = 0; /* Set TOS, Precendence or other QOS options */ - int icmp_sock; /* socket file descriptor */ -+int using_ping_socket = 0; - u_char outpack[0x10000]; - int maxpacket = sizeof(outpack); - -@@ -123,7 +124,11 @@ main(int argc, char **argv) - char *target, hnamebuf[MAX_HOSTNAMELEN]; - char rspace[3 + 4 * NROUTES + 1]; /* record route space */ - -- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); -+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP); -+ if (icmp_sock != -1) -+ using_ping_socket = 1; -+ else -+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); - socket_errno = errno; - - uid = getuid(); -@@ -377,13 +382,35 @@ main(int argc, char **argv) - } - } - -- if ((options&F_STRICTSOURCE) && -- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -- perror("bind"); -- exit(2); -+ if (!using_ping_socket) { -+ if ((options&F_STRICTSOURCE) && -+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ } else { -+ struct sockaddr_in sa; -+ socklen_t sl; -+ -+ sa.sin_family = AF_INET; -+ sa.sin_port = 0; -+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ? -+ source.sin_addr.s_addr : 0; -+ sl = sizeof(sa); -+ -+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) { -+ perror("bind"); -+ exit(2); -+ } -+ -+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) { -+ perror("getsockname"); -+ exit(2); -+ } -+ ident = sa.sin_port; - } - -- if (1) { -+ if (!using_ping_socket) { - struct icmp_filter filt; - filt.data = ~((1<<ICMP_SOURCE_QUENCH)| - (1<<ICMP_DEST_UNREACH)| -@@ -398,6 +425,12 @@ main(int argc, char **argv) - hold = 1; - if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold))) - fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n"); -+ if (using_ping_socket) { -+ if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RECVTTL)"); -+ if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold))) -+ perror("WARNING: setsockopt(IP_RETOPTS)"); -+ } - - /* record route option */ - if (options & F_RROUTE) { -@@ -566,6 +599,7 @@ int receive_error_msg() - nerrors++; - } else if (e->ee_origin == SO_EE_ORIGIN_ICMP) { - struct sockaddr_in *sin = (struct sockaddr_in*)(e+1); -+ int error_pkt; - - if (res < sizeof(icmph) || - target.sin_addr.s_addr != whereto.sin_addr.s_addr || -@@ -576,9 +610,18 @@ int receive_error_msg() - goto out; - } - -- acknowledge(ntohs(icmph.un.echo.sequence)); -+ error_pkt = (e->ee_type != ICMP_REDIRECT && -+ e->ee_type != ICMP_SOURCE_QUENCH); -+ if (error_pkt) { -+ acknowledge(ntohs(icmph.un.echo.sequence)); -+ net_errors++; -+ nerrors++; -+ } -+ else { -+ saved_errno = 0; -+ } - -- if (!working_recverr) { -+ if (!using_ping_socket && !working_recverr) { - struct icmp_filter filt; - working_recverr = 1; - /* OK, it works. Add stronger filter. */ -@@ -589,15 +632,14 @@ int receive_error_msg() - perror("\rWARNING: setsockopt(ICMP_FILTER)"); - } - -- net_errors++; -- nerrors++; - if (options & F_QUIET) - goto out; - if (options & F_FLOOD) { -- write(STDOUT_FILENO, "\bE", 2); -+ if (error_pkt) -+ write(STDOUT_FILENO, "\bE", 2); - } else { - print_timestamp(); -- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); -+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence)); - pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL); - fflush(stdout); - } -@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc, - struct iphdr *ip; - int hlen; - int csfailed; -+ struct cmsghdr *cmsg; -+ int ttl; -+ __u8 *opts; -+ int optlen; - - /* Check the IP header */ - ip = (struct iphdr *)buf; -- hlen = ip->ihl*4; -- if (cc < hlen + 8 || ip->ihl < 5) { -- if (options & F_VERBOSE) -- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -- pr_addr(from->sin_addr.s_addr)); -- return 1; -+ if (!using_ping_socket) { -+ hlen = ip->ihl*4; -+ if (cc < hlen + 8 || ip->ihl < 5) { -+ if (options & F_VERBOSE) -+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc, -+ pr_addr(from->sin_addr.s_addr)); -+ return 1; -+ } -+ ttl = ip->ttl; -+ opts = buf + sizeof(struct iphdr); -+ optlen = hlen - sizeof(struct iphdr); -+ } else { -+ hlen = 0; -+ ttl = 0; -+ opts = buf; -+ optlen = 0; -+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { -+ if (cmsg->cmsg_level != SOL_IP) -+ continue; -+ if (cmsg->cmsg_type == IP_TTL) { -+ if (cmsg->cmsg_len < sizeof(int)) -+ continue; -+ ttl = *(int *) CMSG_DATA(cmsg); -+ } else if (cmsg->cmsg_type == IP_RETOPTS) { -+ opts = (__u8 *) CMSG_DATA(cmsg); -+ optlen = cmsg->cmsg_len; -+ } -+ } - } - - /* Now the ICMP part */ -@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc, - return 1; /* 'Twas not our ECHO */ - if (gather_statistics((__u8*)icp, sizeof(*icp), cc, - ntohs(icp->un.echo.sequence), -- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr), -+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr), - pr_echo_reply)) - return 0; - } else { -@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc, - } - - if (!(options & F_FLOOD)) { -- pr_options(buf + sizeof(struct iphdr), hlen); -+ pr_options(opts, optlen + sizeof(struct iphdr)); - - if (options & F_AUDIBLE) - putchar('\a'); -@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3 - printf("Redirect, Bad Code: %d", code); - break; - } -- if (icp) -- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway)); -+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info)); - if (icp && (options & F_VERBOSE)) - pr_iph((struct iphdr*)(icp + 1)); - break; -@@ -1217,7 +1284,7 @@ void install_filter(void) - insns - }; - -- if (once) -+ if (once || using_ping_socket) - return; - once = 1; - ---- iputils-s20101006/ping_common.c -+++ iputils-s20101006/ping_common.c -@@ -515,7 +515,8 @@ void setup(int icmp_sock) - *p++ = i; - } - -- ident = htons(getpid() & 0xFFFF); -+ if (!ident) -+ ident = htons(getpid() & 0xFFFF); - - set_signal(SIGINT, sigexit); - set_signal(SIGALRM, sigexit); 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 new file mode 100644 index 0000000..19fadf4 --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch @@ -0,0 +1,90 @@ +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-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch new file mode 100644 index 0000000..50e108b --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch @@ -0,0 +1,11 @@ +--- iputils-s20150815/ping.h ++++ iputils-s20150815/ping.h +@@ -61,7 +61,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-20150815-remove-rdisc-glibc-assumption.patch b/net-misc/iputils/files/iputils-20150815-remove-rdisc-glibc-assumption.patch new file mode 100644 index 0000000..8013c3e --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-remove-rdisc-glibc-assumption.patch @@ -0,0 +1,30 @@ +diff -Naurw iputils-s20150815/rdisc.c iputils-s20150815.new/rdisc.c +--- iputils-s20150815/rdisc.c 2015-08-15 07:07:28.000000000 -0700 ++++ iputils-s20150815.new/rdisc.c 2015-10-05 14:41:28.963384717 -0700 +@@ -115,26 +115,7 @@ + + #define MAXIFS 32 + +-#if defined(__GLIBC__) && __GLIBC__ < 2 +-/* For router advertisement */ +-struct icmp_ra +-{ +- unsigned char icmp_type; /* type of message, see below */ +- unsigned char icmp_code; /* type sub code */ +- unsigned short icmp_cksum; /* ones complement cksum of struct */ +- unsigned char icmp_num_addrs; +- unsigned 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-20150815-scope-delimiter.patch b/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch new file mode 100644 index 0000000..bb1f1b6 --- /dev/null +++ b/net-misc/iputils/files/iputils-20150815-scope-delimiter.patch @@ -0,0 +1,14 @@ +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/rarpd.conf.d b/net-misc/iputils/files/rarpd.conf.d new file mode 100644 index 0000000..ef7fc48 --- /dev/null +++ b/net-misc/iputils/files/rarpd.conf.d @@ -0,0 +1,8 @@ +# 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 new file mode 100644 index 0000000..bf8cf1e --- /dev/null +++ b/net-misc/iputils/files/rarpd.init.d @@ -0,0 +1,20 @@ +#!/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" +# 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-20121221-r99.ebuild b/net-misc/iputils/iputils-20121221-r1.ebuild similarity index 92% rename from net-misc/iputils/iputils-20121221-r99.ebuild rename to net-misc/iputils/iputils-20121221-r1.ebuild index 76b54c8..f27730b 100644 --- a/net-misc/iputils/iputils-20121221-r99.ebuild +++ b/net-misc/iputils/iputils-20121221-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,11 +16,11 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" - KEYWORDS="amd64 arm ~mips ppc x86" + 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="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"; +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"; LICENSE="BSD-4" SLOT="0" @@ -52,6 +52,14 @@ fi S=${WORKDIR}/${PN}-s${PV} src_prepare() { + # musl patches + epatch "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch + epatch "${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch + 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 + epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch @@ -59,12 +67,6 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-20121221-makefile.patch epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff - epatch "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch - epatch "${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch - 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 } diff --git a/net-misc/iputils/iputils-20151218-r99.ebuild b/net-misc/iputils/iputils-20151218.ebuild similarity index 79% copy from net-misc/iputils/iputils-20151218-r99.ebuild copy to net-misc/iputils/iputils-20151218.ebuild index 2a33f35..a2c939b 100644 --- a/net-misc/iputils/iputils-20151218-r99.ebuild +++ b/net-misc/iputils/iputils-20151218.ebuild @@ -16,11 +16,11 @@ if [[ ${PV} == "99999999" ]] ; then 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" + 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="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"; +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"; LICENSE="BSD-4" SLOT="0" @@ -37,7 +37,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) ) )" RDEPEND="arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) - traceroute? ( !net-misc/traceroute ) + traceroute? ( !net-analyzer/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -54,16 +54,20 @@ 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 - "${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch #for musl - "${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch #for musl - "${FILESDIR}"/${PN}-20121221-fix-header-order.patch - "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch #for musl ) src_prepare() { @@ -86,6 +90,14 @@ src_configure() { 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 \ @@ -93,6 +105,7 @@ src_compile() { USE_IDN=$(usex idn) \ USE_GCRYPT=$(usex gcrypt) \ USE_CRYPTO=$(usex ssl) \ + LDFLAG_RESOLV=$(ldflag_resolv) \ IPV4_TARGETS="${IPV4_TARGETS[*]}" \ IPV6_TARGETS="${IPV6_TARGETS[*]}" @@ -104,7 +117,7 @@ src_compile() { src_install() { into / dobin ping $(usex ipv6 'ping6' '') - use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + use ipv6 && dosym ping.8 /usr/share/man/man8/ping6.8 doman doc/ping.8 if use arping ; then @@ -127,7 +140,7 @@ src_install() { if use tracepath && use ipv6 ; then dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then diff --git a/net-misc/iputils/iputils-20151218-r99.ebuild b/net-misc/iputils/iputils-20160308.ebuild similarity index 58% rename from net-misc/iputils/iputils-20151218-r99.ebuild rename to net-misc/iputils/iputils-20160308.ebuild index 2a33f35..29f2c89 100644 --- a/net-misc/iputils/iputils-20151218-r99.ebuild +++ b/net-misc/iputils/iputils-20160308.ebuild @@ -6,38 +6,41 @@ # 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 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 + EGIT_REPO_URI="https://github.com/iputils/iputils.git"; + inherit git-r3 else - SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2 + 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"; - KEYWORDS="amd64 arm ~mips ppc x86" + 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="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"; +HOMEPAGE="https://wiki.linuxfoundation.org/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" +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(+)] ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( + nettle? ( dev-libs/nettle[static-libs(+)] ) + openssl? ( !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 ) + traceroute? ( !net-analyzer/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -51,39 +54,51 @@ if [[ ${PV} == "99999999" ]] ; then " fi +REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )" + 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-header-order.patch - "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch #for musl + # 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" + + "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch" ) src_prepare() { - use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch ) - epatch "${PATCHES[@]}" + epatch ${PATCHES[@]} + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch } src_configure() { use static && append-ldflags -static - IPV4_TARGETS=( + TARGETS=( ping $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) ) - IPV6_TARGETS=( - ping6 - $(usex tracepath 'tracepath6' '') - $(usex traceroute 'traceroute6' '') + if use ipv6 ; then + TARGETS+=( + $(usex tracepath 'tracepath6' '') + $(usex traceroute 'traceroute6' '') + ) + fi + + myconf=( + USE_CRYPTO=no + USE_GCRYPT=no + USE_NETTLE=no ) - use ipv6 || IPV6_TARGETS=() + + if use ipv6 && use ssl ; then + myconf=( + USE_CRYPTO=$(usex openssl) + USE_GCRYPT=$(usex gcrypt) + USE_NETTLE=$(usex nettle) + ) + fi } src_compile() { @@ -91,10 +106,9 @@ src_compile() { 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[*]}" + IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ + TARGETS="${TARGETS[*]}" \ + ${myconf[@]} if [[ ${PV} == "99999999" ]] ; then emake html man @@ -103,8 +117,12 @@ src_compile() { src_install() { into / - dobin ping $(usex ipv6 'ping6' '') - use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + dobin ping + dosym ping /bin/ping4 + if use ipv6 ; then + dosym ping /bin/ping6 + dosym ping.8 /usr/share/man/man8/ping6.8 + fi doman doc/ping.8 if use arping ; then @@ -127,7 +145,7 @@ src_install() { if use tracepath && use ipv6 ; then dosbin tracepath6 - dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if use traceroute && use ipv6 ; then @@ -148,7 +166,6 @@ src_install() { 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 index 36b0ace..8fb0527 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -9,6 +9,8 @@ <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="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag> + <flag name="openssl">Use <pkg>dev-libs/openssl</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>
