From 6ddca3f46a47d41caf910d2fb48cac14304bb0c1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 25 Apr 2015 01:47:57 +0000 Subject: [PATCH] Add fix from upstream for checking tftpd set*id calls. Add USE flags to control all the utils (other than ping) as they are all fairly uncommon. Drop ipg entirely as it is a pretty useless script. Re-add support for traceroute via the new USE flag. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- net-misc/iputils/ChangeLog | 14 +- net-misc/iputils/Manifest | 36 +++-- .../files/iputils-20121221-parallel-doc.patch | 74 +++++++++ .../files/iputils-20121221-tftpd-setid.patch | 34 +++++ .../files/iputils-20121221-tftpd-syslog.patch | 38 +++++ net-misc/iputils/iputils-20121221-r2.ebuild | 142 ++++++++++++++++++ net-misc/iputils/iputils-99999999.ebuild | 72 ++++++--- net-misc/iputils/metadata.xml | 7 + 8 files changed, 380 insertions(+), 37 deletions(-) create mode 100644 net-misc/iputils/files/iputils-20121221-parallel-doc.patch create mode 100644 net-misc/iputils/files/iputils-20121221-tftpd-setid.patch create mode 100644 net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch create mode 100644 net-misc/iputils/iputils-20121221-r2.ebuild diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 42a45df07fc8..51863233a9a4 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-misc/iputils # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.142 2015/04/25 01:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.143 2015/04/25 01:47:55 vapier Exp $ + +*iputils-20121221-r2 (25 Apr 2015) + + 25 Apr 2015; Mike Frysinger + +files/iputils-20121221-parallel-doc.patch, + +files/iputils-20121221-tftpd-setid.patch, + +files/iputils-20121221-tftpd-syslog.patch, +iputils-20121221-r2.ebuild, + iputils-99999999.ebuild, metadata.xml: + Add fix from upstream for checking tftpd set*id calls. Add USE flags to + control all the utils (other than ping) as they are all fairly uncommon. Drop + ipg entirely as it is a pretty useless script. Re-add support for traceroute + via the new USE flag. 25 Apr 2015; Mike Frysinger +files/rarpd.conf.d, +files/rarpd.init.d, iputils-99999999.ebuild: diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index a01db1cb64a3..766c1096403c 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -8,8 +8,11 @@ AUX iputils-20121221-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c9 AUX iputils-20121221-makefile.patch 1791 SHA256 779632822e3440f3b898a50955cb8fb72177f0d1623c9da7c0a8afa68313435f SHA512 5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db WHIRLPOOL c0c13046265ad44d23bde66cf48f64803591b4577861fde0ad7873001cbd9284c8593ce277a39d077b5bab635d0f8aa53ad124ea724bbc4584db36570028f90f 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-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a +AUX iputils-20121221-tftpd-setid.patch 815 SHA256 8b1351b43b69a9147b93a0744e57d2634c1fd2abf99856a7447d633bde9cbce4 SHA512 55f7fe0d7312429dd1ec3a9232a4e6436b1115b1b555d5af52f5ee04fe54fdf782dbb018d0dbae1c2e38913057bfa42261a2e57d90c0063b8259029adfa08123 WHIRLPOOL df55138a63fb1b1998e5957eb33f8dfd008dbf9d0701f89dc1bb56a9841b4b9e66ec8d76b83652409655e9b4a953f858eec005fe19463283437a2e477f4ac448 +AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df 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 @@ -17,24 +20,25 @@ AUX rarpd.init.d 692 SHA256 e84222a787d42784406fb71e32816901bdd7b694fb7fb566e73e DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9 EBUILD iputils-20121221-r1.ebuild 2935 SHA256 b3a25f83df129f390654fd1db166fb00864871d018f421caa6a8ce6300d4a5dc SHA512 e11e33a1e4516005a4be9680546fb24967458ff3871ed968bbbdb8be73314cafe099f08d3a84dfe8e2ba9c2c26e4f69af276c1c798585a7cc4783de44f63c1b2 WHIRLPOOL 6ab24c3960aa2ec5d93734c3ec4fcf3f7712c74f676c57aaaacd1239e9f497a25945837bec21736665ce2ad5f2d48093c1efc9ba21e888f4d706ef3205230ae5 +EBUILD iputils-20121221-r2.ebuild 3956 SHA256 29360efbee0e02076f69c034ec3b8846f16a051442b1880233d747dd048e8940 SHA512 e81b3b289ff189b7c5ff5b3d3f5a2b923dd3ce05c9f2bbacf1f6411c0964a6eca55bcd591f35fea394fa1be4dca36df3cd52dcbfb7c0ee0d073b474b665dce58 WHIRLPOOL 8f6654d517ff5094551e107e8d243fb3b70f358d2d93244d7b14efeb675afc44ab97dc95b07cd33777b86a4965d9714b7ce65beec1089b81882f7d655fe30554 EBUILD iputils-20121221.ebuild 2852 SHA256 6df665954e76448c80184e43f7ed3f1aea111ff3b2ac7a30114248db7211ecba SHA512 fd6c699a954802606e886739eb5b0e7d1df0d78256add26cb071d191fbb37ef5c122adfe34dd4e44c27852b05833caed734d23b9cd97c3c71980457e5bc0c6fc WHIRLPOOL 7f172afc263bdc1a16de208343a736ca2bf6a4d3b34500d66cbd93154c471b165d91f56252413a2b3b3f3279d2ddf299e0b5ad6c9da4cd224eab3d6b50c95a0b -EBUILD iputils-99999999.ebuild 2921 SHA256 a3c9cb66ac98c6f34b5625ae57b45fdf5844c0343f9ae2fe5022f3d82b6d0fd5 SHA512 5ba1dd24b40dc58e12bbb93a092ffe4f1337bd63cf587a7c08650fb13b8432c7872f3c2092259a15ada59684ca74ec07f4f0baf63d70b29d950c380b8831ee03 WHIRLPOOL 635780a24592d5cdaf18800d0d6abf7bce888b63c18055d49bc51a1aaff9caaf7dd6e02310994a8c2d9fc678f89321b5ab2a9fafeee161e99311d11aaae4c62e -MISC ChangeLog 21526 SHA256 ed70ea7bb44a07eb1d448bdf16241a4fd70b02425d27b84ec5a172146cdfda3c SHA512 d4de1ca19e4f84df0824b16642b8efe38503bfff98def3e691d4269416db0e708fc0d842ceaa60551a3cbd766dc118755db7b0e1772851b3f086d24ebeb7bc84 WHIRLPOOL d41f1ba43fbe817be4797bf2fc427b9a82df297fe6db6d1c2cd88c1187c55b36af53a02ba55363681e0ce00191913fb00f3ba2560e4bdff691d77e37eda687d0 -MISC metadata.xml 386 SHA256 36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224 WHIRLPOOL 24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764 +EBUILD iputils-99999999.ebuild 3674 SHA256 85fb0c335b703a5f0669b16aab3b21cb161180c792e53fa27456f1755af98373 SHA512 ef4b11de14c68fa21f6c0eb018564d4acf42ebf54da1746fd3876efe3c3e57755dba038787be42237f8d6dfaedca776ff5acc82a7156f34b94265565fcfa2fa2 WHIRLPOOL 3eae58ad13adc8b87df418fda6ed3d77580897a2387ddb34059c7663251fea7c4398f44a39b08c7550d7c32f600aff07cf079d5160200d104983db1631b097b4 +MISC ChangeLog 22079 SHA256 b3f5f0611a778ec7ae62e6c09157d273b78b1f18fa259b259fff1627d01ab0bd SHA512 73686391acfe5b6047bb9ee66ab23c75dab4ec1673ab3ed3bf931d9fb4eb6a0a115a738e69e559b3612db139ed5516d7f370c1b818c52a767689d534002ffbb1 WHIRLPOOL 3c657c58fa04b94383ee28e5c969a03f4b2c88e260a3f64ab7071a21f188aa1a66bc3d7e4fd014b8307938505a9263e2ec1506eed784ffc9862e6addd86e68f9 +MISC metadata.xml 1305 SHA256 45637955ae3f2ef93c3302358b5918b3f116fa6b3176ee1888a26b88f3c1138b SHA512 c3a770322c8e9ff2ed1eae167400b0f5f1a7d51916e813e360fa70399ba620506f50af335f02a36696b95e8ecd5481b40350c700fd7a7e289f9fafb738bda52a WHIRLPOOL 5d8de5bf1e1eb45da472aed975f91f9f971d5838dce5dbf5730ed56c73f0068eb8ae127617e00a6ad3423c494c94ed2e3589f805e0c574711d062df5d91e3a7b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVOuhnAAoJEPGu1DbS6WIAeuoP/jJEPN8wCq5XXCqMOkumRiRa -Jo519l3eDwyR02SnNHn/o1OpXtkrjRYGKHxKkrw7vHxJy8QUMWay75RVHmESfsDa -N/t80xVW/M/4Ei9VFscyg2hpnp76Klxwgzfec7Gxnc+UKBt1mL+u3Y4MhlDE3Wvt -hEUKEHC2fzjop/hT4FNpKiQz+iCnQFuJXzqtXuCTEEO0SJ6lnEzZivz9/7kqs6Az -5RiNBvptOjBSj6l7rYtp48FjxTrn1UBYwgc+wyWreVF+y8xhi5HqB2QVf8D6CC8p -6A9C6hnL9A+4rC188btxlkIBZBdKuF1AEs8Lh/FN+loCkbyBqTvNwrBSjDuRrlux -RxYA68vpanN3OnKdApV/gt9TbbQRD08lUVfJgsmVNy5XuSlcnlLzYqGWCw3sz1EW -jCnJfG5HyxQv3mYpmhqY5vcFMdeIuuJCdT3fyKc8q8G94GXVNjHXvf087jnAIcfg -Mfg2b/V0wCYRH4ZYhblRXUZmVYKybH8kdgAeldlnFIyT87rkTMDpIC5GQfRp10qU -BDbAPM5qlBQmY0aIP+GvP/KQfCZcEbL0yvH7cwZna8sXviWfVnbj2nMLiLlGIXQT -PfVunM0jcWG/VoPypFypL577Z1Fvim7vV7WnCz53PdcV9MHKJjCu0edAczgsBYBG -4FCcXqDLs08TsmO89RD8 -=UVbY +iQIcBAEBCAAGBQJVOvJMAAoJEPGu1DbS6WIAuAEP/RhEIhQhVgdflDicmrzo6nft +MSS2DlDE/r+4h5lxluZ9jP8kxvozQi2QG9nFXc2Km3zXySwHruuniJpmdB/mgPas ++6zWJBlr9K1LlE9AokRtbcHRNodWzPy+qLYx95C+tnnfGjXfxCmjyX66wRvAY09f +0FiKE/88Z5y4c8mV4XF1R2dKPE70mgZpXBVLzAAUeTRRUxNew1pP0vyVxYbkkuw8 +JkQe8qXP/27+gl78MTmOpQe5z494YtDW7DwbEi4bXPZwd1N+YsPQvRIBbQ/zW9is +kO410Rnv2drZ35OlB1R6DXz1ewDNuYCQHzTmsOl/2tb+lRKxIvYMwzTxU3v26zc5 +aH8nIOjHmyyexnfR6hE3VIBIspev/gYEgzorsiKHYp4gVdeEgduiEjojopV0TbNi +txQ/ESkv8A46yaNwI3xqnJlq+nfBoPZDSrhOINfbotzPglpXMp1bBin1TTgwRfxF +xdTqx48pEdg7b8zjDqm2awOE3A5V6PfaPJEQCcMx2jqwAmmlzuzyX0oeJXpPx4eJ +uNhX39rzoPb1u1Py0GZxD9gJRlg7ilmhijS2w+6Iz+Lz6yzR9MJuRNONRolcRWBM +HsI3NNQuovvxy2hVQzYmN/J39Qm7gA2srllsmhix6uEobMTHs20RRt5Sc0I7Fw4Y ++Qt3RYXvavC+ueqlJpgU +=AAe9 -----END PGP SIGNATURE----- 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 000000000000..22bfb8811ed3 --- /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 +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 +--- + 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-tftpd-setid.patch b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch new file mode 100644 index 000000000000..0ea56685d26d --- /dev/null +++ b/net-misc/iputils/files/iputils-20121221-tftpd-setid.patch @@ -0,0 +1,34 @@ +From d81a44625b04d487c895473aa77af13420b7afdd Mon Sep 17 00:00:00 2001 +From: YOSHIFUJI Hideaki +Date: Thu, 19 Jun 2014 17:25:49 +0900 +Subject: [PATCH iputils] tftpd: Exit if setuid()/setgid() failed. + +Signed-off-by: YOSHIFUJI Hideaki +--- + tftpd.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/tftpd.c b/tftpd.c +index 2a39ec4..e3af2f4 100644 +--- a/tftpd.c ++++ b/tftpd.c +@@ -111,8 +111,14 @@ int main(int ac, char **av) + + /* Sanity. If parent forgot to setuid() on us. */ + if (geteuid() == 0) { +- setgid(65534); +- setuid(65534); ++ if (setgid(65534)) { ++ syslog(LOG_ERR, "setgid"); ++ exit(1); ++ } ++ if (setuid(65534)) { ++ syslog(LOG_ERR, "setuid"); ++ exit(1); ++ } + } + + ac--; av++; +-- +2.3.5 + diff --git a/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch new file mode 100644 index 000000000000..ad34f3b5f646 --- /dev/null +++ b/net-misc/iputils/files/iputils-20121221-tftpd-syslog.patch @@ -0,0 +1,38 @@ +From e88ed3752872d7c7ca37d95eb4d434ca4d3c4eae Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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-20121221-r2.ebuild b/net-misc/iputils/iputils-20121221-r2.ebuild new file mode 100644 index 000000000000..1b31489acddd --- /dev/null +++ b/net-misc/iputils/iputils-20121221-r2.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r2.ebuild,v 1.1 2015/04/25 01:47:55 vapier Exp $ + +# 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="4" + +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 + mirror://gentoo/iputils-s${PV}-manpages.tar.bz2" + 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" + +LICENSE="BSD-4" +SLOT="0" +IUSE="arping caps clockdiff doc gnutls idn ipv6 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? ( + gnutls? ( + net-libs/gnutls[openssl(+)] + net-libs/gnutls[static-libs(+)] + ) + !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) + ) )" +RDEPEND="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} + +src_prepare() { + epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch + epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436 + epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch + epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347 + epatch "${FILESDIR}"/${PN}-20121221-tftpd-setid.patch + epatch "${FILESDIR}"/${PN}-20121221-tftpd-syslog.patch + epatch "${FILESDIR}"/${PN}-20121221-makefile.patch + epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch + epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch + epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff + epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 + use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch +} + +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_GNUTLS=$(usex gnutls) \ + 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 + + into /usr + + local u + for u in arping clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + dosbin ${u} + 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 'usr/bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') +} diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index 65d508efbb84..2405ad7abcb7 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.17 2015/04/25 01:05:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.18 2015/04/25 01:47:55 vapier Exp $ # For released versions, we precompile the man/html pages and store # them in a tarball on our mirrors. This avoids ugly issues while @@ -24,7 +24,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputi LICENSE="BSD-4" SLOT="0" -IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static" +IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute" LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn[static-libs(+)] ) @@ -35,7 +35,8 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) ) !gnutls? ( dev-libs/openssl:0[static-libs(+)] ) ) )" -RDEPEND="!net-misc/rarpd +RDEPEND="rarpd? ( !net-misc/rarpd ) + traceroute? ( !net-misc/traceroute ) !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -56,9 +57,24 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-99999999-openssl.patch #335436 epatch "${FILESDIR}"/${PN}-99999999-tftpd-syslog.patch epatch "${FILESDIR}"/${PN}-20121221-makefile.patch + epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592 use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch +} + +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() { @@ -68,38 +84,54 @@ src_compile() { USE_IDN=$(usex idn) \ USE_GNUTLS=$(usex gnutls) \ USE_CRYPTO=$(usex ssl) \ - $(use ipv6 || echo IPV6_TARGETS=) + IPV4_TARGETS="${IPV4_TARGETS[*]}" \ + IPV6_TARGETS="${IPV6_TARGETS[*]}" if [[ ${PV} == "99999999" ]] ; then - emake -j1 html man + emake html man fi } -ipv6() { usex ipv6 "$*" '' ; } - src_install() { into / - dobin arping ping $(ipv6 ping6) + dobin ping $(usex ipv6 'ping6' '') + use ipv6 && dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8 + doman doc/ping.8 + into /usr - dobin clockdiff - dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6) - newinitd "${FILESDIR}"/rarpd.init.d rarpd - newconfd "${FILESDIR}"/rarpd.conf.d rarpd + local u + for u in arping clockdiff rarpd rdisc tftpd tracepath ; do + if use ${u} ; then + dosbin ${u} + 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 ipv6 \ - && dosym ping.8 /usr/share/man/man8/ping6.8 \ - || rm -f doc/*6.8 - rm -f doc/{setkey,traceroute6}.8 - doman doc/*.8 use doc && dohtml doc/*.html } pkg_postinst() { fcaps cap_net_raw \ - bin/{ar,}ping \ - $(ipv6 bin/ping6) \ - usr/bin/clockdiff + bin/ping \ + $(usex ipv6 'bin/ping6' '') \ + $(usex arping 'usr/bin/arping' '') \ + $(usex clockdiff 'usr/bin/clockdiff' '') } diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml index 5c2d8fe5f6ff..dc01592f7171 100644 --- a/net-misc/iputils/metadata.xml +++ b/net-misc/iputils/metadata.xml @@ -3,6 +3,13 @@ base-system + Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping) + Build and install clockdiff -- tool for comparing clocks via ICMP packets + Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems + Build and install rdisc -- server for the client side of the ICMP router discover protocol + Build and install tftpd -- server for the Trivial File Transfer Protocol (see also net-ftp/tftp-hpa) + Build and install tracepath -- tool for tracing network paths for discovering MTU values + Build and install traceroute -- tool for tracing network paths (see also net-analyzer/traceroute) Allow non-root users to flood (ping -f). This is generally a very bad idea. -- 2.26.2