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 <[email protected]> +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 <[email protected]> +--- + 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 <[email protected]> +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 <[email protected]> +Signed-off-by: Mike Frysinger <[email protected]> +--- + 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 <[email protected]> +Date: Thu, 24 Jan 2013 23:32:39 -0500 +Subject: [PATCH iputils] ping6: allow disabling of openssl support + +Signed-off-by: Mike Frysinger <[email protected]> +--- + 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 <[email protected]> +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 <[email protected]> +--- + 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' '') +}
