Version bump #453806 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

10 files changed, 630 insertions, 54 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 1912cb456292..42d592154945 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/iputils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.106 2012/04/20 19:56:55 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.107 2013/01/25 05:28:28 vapier Exp $
+
+*iputils-20121221 (25 Jan 2013)
+
+  25 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/iputils-20121221-crypto-build.patch,
+  +files/iputils-20121221-makefile.patch, +files/iputils-20121221-openssl.patch,
+  +files/iputils-20121221-owl-pingsock.diff,
+  +files/iputils-20121221-printf-size.patch, +iputils-20121221.ebuild,
+  iputils-20101006-r2.ebuild, iputils-99999999.ebuild:
+  Version bump #453806 by Agostino Sarubbo.
 
   20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/iputils-20070202-makefile.patch, -iputils-20100418-r1.ebuild,
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 0d0a4a45a4ff..b781f5816b87 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,32 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 SHA1 8e7fda98a1cc1fae5b8f75f9aec200fcb3afee49 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b
-AUX iputils-20070202-idn.patch 3303 RMD160 77cc510e77956cdb3b598297756998ed9728775d SHA1 aad5d04fbe861f049d58ecfc3d6efebb92b63f10 SHA256 449e356a14aee6ad27ac4581055d489da764403447df8f2a50ecb1c4ac71e533
-AUX iputils-20071127-infiniband.patch 7748 RMD160 343761bf50becbab90a570a879a536f49b0bb6ab SHA1 03e58876fe4cced3a0a2fcbac2cdabf49245914b SHA256 98336a7656f2b0e1f080223395658ac57f545ef47644d68e989664a184c769d5
-AUX iputils-20071127-kernel-ifaddr.patch 1467 RMD160 25082fb7976aaefdd6f4da753871d7d744fc171d SHA1 8ea5c4fe3aeed984bd6f6e377b4e304f38127c5d SHA256 24d24c86676c8d6febb52650e53f202051ec9f185932b87d8400eee0f77f569e
-AUX iputils-20071127-nonroot-floodping.patch 497 RMD160 7dddcb6e07c67620a83ff4a9d827270404e3fc32 SHA1 337b226525895f5b02463597d95efc7ea204f399 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52
-AUX iputils-20100418-aliasing.patch 2897 RMD160 210d763dbae8d31485a5bf1f1792cd9183e93c54 SHA1 de370b6fa6ff56c557741f4edbc4fb70c22f3c35 SHA256 8df8b1c510a1630d06d71f801d57c9182729f0308545026b999868ad55469914
-AUX iputils-20100418-makefile.patch 974 RMD160 81e2022321a3af15eb3f025e8ad74d19690aeb21 SHA1 abaffdf7a61e00907de221afada04d62c58e00a4 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b
-AUX iputils-20100418-openssl.patch 628 RMD160 1ffdf37da69bec307e1f95ceeb63a95d796b49ec SHA1 065fc8e24efef8f36e02442976dcd8e0248732be SHA256 4e009a36451b599b2717ec6c6d7d9adb4723d7629fffaf07a5926ee80af9a3ea
-AUX iputils-20100418-printf-size.patch 1658 RMD160 5ddc3104d1819d009a5cc0280a9d5450a4210d6e SHA1 47d280f6ce48086ec256ef1680db9de712d49e7f SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc
-AUX iputils-20100418-proper-libs.patch 427 RMD160 193c37ccd98bb9cb5ed1d98e067386768cca607e SHA1 695c795567e1914c83f346b629028484140811ba SHA256 6566f7dd311df08ed51a03758ef3137a24b1883452f86df1821bc266c6d1616f
-AUX iputils-20100418-so_mark.patch 597 RMD160 2387e035471e05d5cd5d923d312e213ee091f9b4 SHA1 391fc82a6868dea79f599befeb2c5e6000e5db27 SHA256 3c0c3e93d3b458a02f856be3681c2dd5bfb18933e4752e90dc277cdd353b3576
-AUX iputils-20101006-owl-pingsock.diff 6390 RMD160 2c89b1a7d8098b78bd6862b6bf69b9c0f2450f95 SHA1 2ebf2b10a963acc055630cd3402aae3c569273bb SHA256 1425efd6d30e6c9682569ff1de731922351048f81df44a2ebad30cca85fc51c9
-DIST iputils-s20101006-manpages.tar.bz2 21638 RMD160 3568e7b294cd6dbe167745573b883f4ea83fe35f SHA1 63132b3c98cd76f72d2f2928f6f29ded420a410d SHA256 071b13a9154070168204ff49fa2564b56e4a1706020a2923ba9d3198f317d954
-DIST iputils-s20101006.tar.bz2 94386 RMD160 d97c5c51f88db6e39d79812dfbc88efdc329305f SHA1 a08cc5423a7bf940205f2353fe3d129cd39ff242 SHA256 fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7
-EBUILD iputils-20101006-r2.ebuild 2865 RMD160 f073c4f52db3ddc9fac0703fe8bf7d39ad5a5403 SHA1 5c222075eaa49483ff0c7eea5150bba8cbc9ea6d SHA256 9904f13efcd45ff62473a4f7019706e2981889b97c4a0005587f34833e59a55f
-EBUILD iputils-99999999.ebuild 2870 RMD160 7918d96160b046b0630a1bdde62b92fca8182f25 SHA1 477a272576ab7ed29be0660851316501e1b261f7 SHA256 b83275beed085923f5ad727395f3c55d67b4341a163c40e3a3a6552ca050d8af
-MISC ChangeLog 15821 RMD160 afe146c027bc8b1c2e5d9b10ff8236cb0aa91b6c SHA1 fc3851d9818457444d64612562e3e21d87d21f81 SHA256 f0bc9d05938037318cf5c7a804d07ffc63fc5a65840c90338faa9911324a393c
-MISC metadata.xml 299 RMD160 44839875595bd58f9d7f5245d366eb3d0e1ffb1f SHA1 224a2c26c04621e6277b1d887902911e4a9bc2eb SHA256 d028d4ba25f3ed29afbbf77abd924a617098bff71e6a0c37b7d6c0a24cd65a78
+AUX 021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38 WHIRLPOOL e5390a41b0764d78cda651dd6fff2ebd4f206dc6f5b34da370c19cee7d44f373035fc1efa2bf90924b5a06ca48f344f80a2c902abe04eb588d01e0a9d59bf79d
+AUX iputils-20070202-idn.patch 3303 SHA256 449e356a14aee6ad27ac4581055d489da764403447df8f2a50ecb1c4ac71e533 SHA512 42037984cf29e1166cca31fd4325e3deed5739a5aa9ba3632a201f06bb5ae76b291a10350f6cff037cfa158c5573a5f6c9bb420c21041779669497760d5d232d WHIRLPOOL 3183deb53d6773c884b46efc86ddf231b934b91d34742158b17d4901f4b8aab292ac9e18414816d611f922ecf2d252d76c7b2f49a0f7489ff031f8b9022d99c9
+AUX iputils-20071127-infiniband.patch 7748 SHA256 98336a7656f2b0e1f080223395658ac57f545ef47644d68e989664a184c769d5 SHA512 9b74062ff74551b4de1cedcf4854e77759e3936b54e2db5fd9cdbbc8028a55495a2a2c10fc0514fc374343a644bf0c9706076480703e45a41c9f552846d93a51 WHIRLPOOL 6a0cd3df4080c7937c2f6de8fa3ea8eb8da5e5337d1c28ae706e81678373f4064c74f4da46dca0a3cdf461fce92948b58ea2629d2573b4098c712bfdeedbc08e
+AUX iputils-20071127-kernel-ifaddr.patch 1467 SHA256 24d24c86676c8d6febb52650e53f202051ec9f185932b87d8400eee0f77f569e SHA512 a7cfd4f660a0742509d6e7b3985d81404ebef453fd32fd2a28118bc7304ba957e8306c6acd16609d88c41918fa49c9ae9c83c59e16fedd951cbdcbff544b17b7 WHIRLPOOL 89958a184cd4f4ff59b880c17f995bf16a4957ba163f3989d3ea2d99e8d2c1a603101ee9194c3f17970dc452fc52d8cf251da75e259846da9fcf4e20a9e8893f
+AUX iputils-20071127-nonroot-floodping.patch 497 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8 WHIRLPOOL 1f880978cf70188d0d59e79396f8c5962655c00cbf7f7c7adb800316dea1b6748ddbc788681c9831edf0fbb1153e85b5ca35e0e3c131b0a5b4884fa511119c0c
+AUX iputils-20100418-aliasing.patch 2897 SHA256 8df8b1c510a1630d06d71f801d57c9182729f0308545026b999868ad55469914 SHA512 d50595a1c4a6f4b54099050569cde2fb1e5ebe553cca7d45d6cc674b075086b7d1fc54816ca92bc5856dc14e62b6d20b5ebc1c39cc1786f46a96b7e08bdca3ad WHIRLPOOL 129ff37eff62a115cfdbfe6ae5a6b529cb290a909dace4d5e71ffd37aa7707d3313c0de1e7bf31a41c9ec0b7365ef05d9a406c85cb96dbffe418b3e78e62c6c7
+AUX iputils-20100418-makefile.patch 974 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b SHA512 c3c9096cd2587e39afdd0a78291a4f67249e2fc75c303cd648a795f7c88dc7e9e2c27f3f56fe6d7d40bdcb0d179dfd35f1c991ba8fd3524149f8cbb94d9ef0ca WHIRLPOOL b4fa577f4b52792165abda924a1980fb1101c7f5a15714b4a9647535e5be622c54e6ef0f731212a74b1a6fc1ddfcf54f98e5c0a0c540e0113823e7646dd6df8a
+AUX iputils-20100418-openssl.patch 628 SHA256 4e009a36451b599b2717ec6c6d7d9adb4723d7629fffaf07a5926ee80af9a3ea SHA512 c7bf0317e893386172e65679ead3e1eebcb7805f96f99de4170df495fc9ed573b03b51a1ab69bc0390705914cba72b61e5e33a454eb8ec43a7fd07ae50ffb3dc WHIRLPOOL a3b53d485d948a50dc988af65eaafa73fc08d88cbc2731061ae5607e110f01af3cd009e2287a9a633728768def7702392fae7ccb17e322bee214bee76c958553
+AUX iputils-20100418-printf-size.patch 1658 SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc SHA512 556237d39043815f196b0f22ec552bfb52ad2d45b2faf67e26712361bc11acd21cec42b8241ccf72778b421b9f456a37e9466dbfc03c0df2be1e1bb5ae48a92e WHIRLPOOL 80d03f09a6b023413845f5fe12e6decd87e70c143ad79215d66b1fd29c42bf7b61580addac910dd2134c9d4bf41432f21c7a63184e76aa1bdd936621da6b12d6
+AUX iputils-20100418-proper-libs.patch 427 SHA256 6566f7dd311df08ed51a03758ef3137a24b1883452f86df1821bc266c6d1616f SHA512 b6f42a1dda591ccde770a665387ff3a0c0fe925180487ef57852ad5a76f1bd781d56e3266894e8868d84a7016f7d6fecf1068e4ced7b1e104a9a54b08ed4427c WHIRLPOOL d2f7bb97bb2871b2a84412da5303b87cdefa0b3d5fe115fbaad6fb6b58907c83f39c04e3573e7cef76401f66beee698ac0676f0fdfadeaff6ab79b2d3a6476b7
+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-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c981bcf203b4c6266d4f49437c3fe67e2027b2 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 WHIRLPOOL a39c7dbb9b37849cc3560dc1f814a8c18a9ff9b55e19c3587a7c49286d55323f96d42d33c6f2723d3868506c252272e1d2d6bc3370eb935b479c89514f03c9c5
+AUX iputils-20121221-makefile.patch 1410 SHA256 5dd6629ca13254513c2e70f6f0ae29b364d6c29e4549757b593cb8a069ef85c3 SHA512 c9db6d9d5ce922a4c4bcafea9d674a3f9fb1c475380ca0c3e1ba1e926ffe4b07ba8e2100c2cb3e64d69190c817ff6d73023f54d2decdb574e90e5314ac67d719 WHIRLPOOL 273e2743cb81d663526436462273cffe49e3958170ff4997db04a79d8d9c3a013a9726fdd8cec9de560d8cb6c5c764909fb8be000c1b295b43f379b1c34594c0
+AUX iputils-20121221-openssl.patch 2378 SHA256 cc1af5ccdd593b4fa43273cf7de8b9552f0a5d33a72a35fcc4f94cf2c6fc9a44 SHA512 05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b WHIRLPOOL 66052233f933cf30fe1572578012faa380f53580307e880e9a94c001ea14e585b3e28693c8e3883ee6350bb6af04a6931732ebaa284c4e3851b64081e042d081
+AUX iputils-20121221-owl-pingsock.diff 6374 SHA256 915e18ee5a03f5636b408ff34a5576ad8899a3d93d5fe8182984c3565bd94375 SHA512 2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395 WHIRLPOOL 205179fa205e8bd88a9077cf628ec1a060189ee01d55c45dbe754f3bc36a496531cb9eab120507eff5d72140c934a7480d6a015fa6020f7dcecdfbc6ef590443
+AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 WHIRLPOOL 8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee
+DIST iputils-s20101006-manpages.tar.bz2 21638 SHA256 071b13a9154070168204ff49fa2564b56e4a1706020a2923ba9d3198f317d954 SHA512 313f11bd59b89b4be33eb613140b23ead87c731abfb82944bde16fbb46d0c29f896d3c1a06f6bf0f92f103b5f867d25b361dbb4bba364a1393945e9c94ebe2ca WHIRLPOOL d0b394a21b660fa014b31c90dce28d2b28ccc72e4223ad0e206609f5e167ed21fc514dcc956f9545771f44649c75d9bf996b51a5d058ef59d7e12cb18f8dc64e
+DIST iputils-s20101006.tar.bz2 94386 SHA256 fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7 SHA512 3a001e7a69074c6c48bd328c57ba9bd5e465bcc0005a03187ccd127d74ed4d083e76e43c34b123eb6cf246e16716b1e56613ffd611aa2eea83e70337a95e0360 WHIRLPOOL 4a9e95ef95806bcae74ebbb6716229a1326a2e7323318af6e242690ff359e51323aaefed5c8838605fdc9f977b48dca293c7b8db88bc629a4433d865297db19e
+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-20101006-r2.ebuild 2887 SHA256 1b9c683f1532748b27ef1d14c462ee254234c755629135371815c7930ebb395e SHA512 6a2accea1c49891e3bcb483dd16ea6d0801c6eb59babdbb1ff488f40c940b76d2a56cefb46208836c67f1b18de4d090a72e36e37893cc1bccd3f68da75afc356 WHIRLPOOL c8301bed7a59a1422a75a4afa6723e2535e2ce522f4c2edc1cd82b1005dfc678647fc00f7a411d8a3faa0fa170b212b8cd49dbc8ddb7fed4b46f64084d73d994
+EBUILD iputils-20121221.ebuild 2689 SHA256 9e4bc46f5ce15609dde501b5e9bfc83e13bf74db3b48c54a3483641c5dfea218 SHA512 83f0659c953bab41ebdffbce752db1a8c9ebd5c281a698c9ee0d316da13256176033b9a7f1e69551f5d334125f8a8e31b9705fff0a804a807e548cae601eaf5f WHIRLPOOL 107391dcf29f7ec3f03d4bd7f8ab00af12cc5cbc9411ff36fb1d23d892ee255fe8c91606b4c565cd04c75e0d1a87dad606ecc561478ffaec276cc069ebdbf630
+EBUILD iputils-99999999.ebuild 2633 SHA256 7f54a58cd9b028c627bbc406fe6f722d9528010c3621dd6327e9b49a2f56e24b SHA512 6aea77c5c0f2372cede36456d6586a9d25a94525ae103e1a6531ccc17d3e1467a8019fe000d83a3c2aff62c174c71eeb0022f3b44fb23b09a01621c02757f833 WHIRLPOOL b49042c05aa5f351abf85a657f5e7f3aad3c85d286823e04205f4b236f33b6bbe5454fdd7c4fabe9756de35452cc194c807d2259cb1eff7deafca8089394e23e
+MISC ChangeLog 16244 SHA256 0b870f7580a658cff1ba3857858baef3c2dc8f460ee91f100c78f1bef78d7bd6 SHA512 ae745fd9ff0cae5eb046b6da7f04b79c4e3bf1572c89052bddd1a4fa100a45091587f31f5dd506036a65183c8a396f8c0914faa193ee3c5b139ea2c086ec65d7 WHIRLPOOL 3f95022d7274dcaca219d88fb1450bd50d57a4471a63852b4283bf0f14b079ab24e37c3fc47b268957ab63b96b521d1a2b3d83d37d98ac3414f1bda9bdfb93da
+MISC metadata.xml 299 SHA256 d028d4ba25f3ed29afbbf77abd924a617098bff71e6a0c37b7d6c0a24cd65a78 SHA512 25c1c360ecadd8f3cb4476635d94de097ef2d7c8a8e5b8305c1626246fc89e60b6cf7661002d85b37cd6f01594020e568f835d657e2318e417cd3859971d83f7 WHIRLPOOL adda1e0b6cd078dbf5740f575ff8d4a4ab108b3f06e192d6d948bf03a5d249013fb5d52d3069d8024e3c40b23d02f31ca219a2e91c1e28312324dd2f68eb7f11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPkb8pAAoJEEdUh39IaPFNls8H/jks6Nt/0IreIWt+s6OM+BsC
-5rs/f7vnBUgim1FkG3KOQJzdWPWXD3jJpL4ZBfcniWX7uH5ng35+TnCcy1+fiY0R
-QnIht2PIGFxEN4XWJAo4jl0BuTX2MBI1AaUrqQxpWdiyd99mUtZLzLyhvb3nhMXN
-fNYm3jNFlie+qPaooDevZEcXt7FNmlv2uv80gJV/Fv0tCaOpziPJH3H/ykylnrND
-tIcNlrc7RRIcPRA26gvvaHdSsoEjRETZzGTFWy08nDDZLm+b3Xq8fd8alGs4n9Oz
-kiFhvpPvNW80V4Pwwyxo9ka9VSvV8tZDjd8ZX07BvFRYbJV1ncPewqV3fqSyCGM=
-=/0cT
+iQIcBAEBCAAGBQJRAhgCAAoJELEHsLL7fEFWqD8QAMn+nzMGGmLHTAZFaUtqBE1+
+T2biox06xCYyldSDJ666eMuTs/SulI38Fr00sbY0GtmVPRSVAwUy1l08sC57xhKn
+YW4J1bVZGhg3BdFJkRPVst/3zFLvMVOZ1kOsU5q54UiVMdTPGNJfGLs/iV3i6JhA
+6lgcrKW1O/g2ZOmWm/jSnRePXl09ZYrZC2/h2dOeX8/cf953V4Qve8XF9U1xrsI4
+E0L2gEUTecvRlIWEF2cL1fNXkaKyJZNh/cX1ndWAht/PI0QyzPhQWXYNGH5yGabT
+LtzvvU2/IH6431F8qoU+r1Ss1IxsrJ97wlmEy4jzf3gkaVSnHhMS2SOy8DKvhMDD
+DbydbU0DrQiDWM2BIlYR58nTQPURycAkJn7bRVNXjbKx8Q05XAkrOggb9USH//2I
+7BK0sEVfeKSqPubu/ehMKSSzJPN1EAqatWynCx6rX0TjNZoX3nC+52hN3xn0f6vJ
+sgPKseftchnSUOd9Iw1R9mfSF3X16/9Z0TG+CGWMkYjbMM+ui+Kz4C8kHOGPKLib
+BJkJD8K7teN+Io++aSxKsU/90nAZCX0PA15OPq3eug/ziVok1EO/27Xs4oZfSJiT
+OqLtLrNBWjKpk7K7gmCncALr8nXHR0/8wJON9XwCPJy21TpLZnJXlthS9XTHq/5O
+T6DQvBb8uXGbyMocyOT6
+=UKCE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/iputils/files/iputils-20121221-crypto-build.patch b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
new file mode 100644
index 000000000000..1ec3c101d525
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
@@ -0,0 +1,35 @@
+From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
+From: Arjan van de Ven <arjanvandeven@gmail.com>
+Date: Wed, 16 Jan 2013 03:12:15 +0900
+Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
+
+The ping6 command can use either openssl or gnutls...
+and the Makefile has a bunch of setup for defining which of the two to use.
+
+Unfortunately, the final -D define on the commandline to enable gnutls
+inside the ping6.c file didn't actually make it onto the gcc
+commandline.
+This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
+
+Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
+Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c62d9df..89249f5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
+ DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
+ DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
+ LIB_ping  = $(LIB_CAP) $(LIB_IDN)
+-DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
++DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
+ LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
+ 
+ ping: ping_common.o
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
new file mode 100644
index 000000000000..3517194d539c
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-makefile.patch
@@ -0,0 +1,44 @@
+From 8ed9db9f7079d1b602356e86ea13a7cf51f045b7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:36:16 -0500
+Subject: [PATCH [iputils]] fix handling of CFLAGS
+
+This defaults CFLAGS to -O3 without clobbering settings people have set
+up in the environment already.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 2c49940..dc317b1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,11 +48,10 @@ ENABLE_RDISC_SERVER=no
+ 
+ # -------------------------------------
+ # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
+-# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
+-CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
+-CCOPTOPT=-O3
+-GLIBCFIX=-D_GNU_SOURCE
+-DEFINES=
++# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
++CFLAGS?=-O3 -g
++CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
++CPPFLAGS+=-D_GNU_SOURCE
+ LDLIB=
+ 
+ FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
+@@ -113,7 +112,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
+ IPV6_TARGETS=tracepath6 traceroute6 ping6
+ TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
+ 
+-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
+ LDLIBS=$(LDLIB) $(ADDLIB)
+ 
+ UNAME_N:=$(shell uname -n)
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-openssl.patch b/net-misc/iputils/files/iputils-20121221-openssl.patch
new file mode 100644
index 000000000000..1c6ba81dab8b
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-openssl.patch
@@ -0,0 +1,92 @@
+From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 24 Jan 2013 23:32:39 -0500
+Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile |  5 ++++-
+ ping6.c  | 14 +++++++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 89249f5..2c49940 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
+ 
+ # GNU TLS library for ping6 [yes|no|static]
+ USE_GNUTLS=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_GNUTLS),no)
+ 	LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
+ 	DEF_CRYPTO = -DUSE_GNUTLS
+ 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/ping6.c b/ping6.c
+index c39864d..f2f90af 100644
+--- a/ping6.c
++++ b/ping6.c
+@@ -168,8 +168,10 @@ static int icmp_sock;
+ 
+ #ifdef USE_GNUTLS
+ # include <gnutls/openssl.h>
+-#else
++# define USE_CRYPTO
++#elif defined USE_OPENSSL
+ # include <openssl/md5.h>
++# define USE_CRYPTO
+ #endif
+ 
+ /* Node Information query */
+@@ -326,6 +328,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;
+ 
+@@ -348,6 +351,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
+ 
+@@ -502,6 +509,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;
+@@ -627,6 +635,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)
+-- 
+1.8.0.2
+
diff --git a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
new file mode 100644
index 000000000000..283aa989f322
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
@@ -0,0 +1,224 @@
+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("\bE", 2);
++			if (error_pkt)
++				write_stdout("\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-20121221-printf-size.patch b/net-misc/iputils/files/iputils-20121221-printf-size.patch
new file mode 100644
index 000000000000..6d6c3b7d2580
--- /dev/null
+++ b/net-misc/iputils/files/iputils-20121221-printf-size.patch
@@ -0,0 +1,64 @@
+From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 14 Aug 2010 01:16:42 -0400
+Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
+
+Since the printf funcs already return the length of chars displayed,
+use that value instead of re-calculating the length with strlen.
+
+This also fixes the handling of the strlen return -- it's a size_t,
+not an int.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tracepath.c  | 11 ++++-------
+ tracepath6.c | 11 ++++-------
+ 2 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/tracepath.c b/tracepath.c
+index 8a08f1d..f155816 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -73,13 +73,10 @@ void data_wait(int fd)
+ 
+ void print_host(const char *a, const char *b, int both)
+ {
+-	int 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 126fadf..bee95c3 100644
+--- a/tracepath6.c
++++ b/tracepath6.c
+@@ -86,13 +86,10 @@ void data_wait(int fd)
+ 
+ void print_host(const char *a, const char *b, int both)
+ {
+-	int 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.8.0.2
+
diff --git a/net-misc/iputils/iputils-20101006-r2.ebuild b/net-misc/iputils/iputils-20101006-r2.ebuild
index 42a04f73ecac..8358e82f331a 100644
--- a/net-misc/iputils/iputils-20101006-r2.ebuild
+++ b/net-misc/iputils/iputils-20101006-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006-r2.ebuild,v 1.7 2012/02/13 09:54:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20101006-r2.ebuild,v 1.8 2013/01/25 05:28:28 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
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/iputils/iputils-20121221.ebuild b/net-misc/iputils/iputils-20121221.ebuild
new file mode 100644
index 000000000000..1eeb07d07357
--- /dev/null
+++ b/net-misc/iputils/iputils-20121221.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221.ebuild,v 1.1 2013/01/25 05:28:28 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
+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 ~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"
+SLOT="0"
+IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
+
+RDEPEND="!net-misc/rarpd
+	caps? ( sys-libs/libcap )
+	gnutls? ( net-libs/gnutls )
+	ssl? ( dev-libs/openssl )
+	idn? ( net-dns/libidn )"
+DEPEND="${RDEPEND}
+	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-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
+	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		$(use ipv6 || echo IPV6_TARGETS=)
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake -j1 html man
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	use ipv6 && dobin ping6
+	dosbin arping
+	into /usr
+	dosbin tracepath
+	use ipv6 && dosbin trace{path,route}6
+	dosbin clockdiff rarpd rdisc ipg tftpd
+
+	fperms 4711 /bin/ping
+	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
+
+	dodoc INSTALL RELNOTES
+	use ipv6 \
+		&& dosym ping.8 /usr/share/man/man8/ping6.8 \
+		|| rm -f doc/*6.8
+	rm -f doc/setkey.8
+	doman doc/*.8
+
+	use doc && dohtml doc/*.html
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 5207736b8d17..694c550e8494 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.6 2011/11/09 22:34:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.7 2013/01/25 05:28:28 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="2"
+EAPI="4"
 
 inherit flag-o-matic eutils toolchain-funcs
 if [[ ${PV} == "99999999" ]] ; then
@@ -20,13 +20,15 @@ else
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
+IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 
 RDEPEND="!net-misc/rarpd
+	caps? ( sys-libs/libcap )
+	gnutls? ( net-libs/gnutls )
 	ssl? ( dev-libs/openssl )
 	idn? ( net-dns/libidn )"
 DEPEND="${RDEPEND}
@@ -44,41 +46,38 @@ S=${WORKDIR}/${PN}-s${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
+	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
 	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
-	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
-	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
-	epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
-	epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff
+	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
 	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
 	use static && append-ldflags -static
-	use ssl && append-cppflags -DHAVE_OPENSSL
-	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-	export IDN=$(use idn && echo yes)
 }
 
 src_compile() {
 	tc-export CC
-	emake || die
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		$(use ipv6 || echo IPV6_TARGETS=)
 
 	if [[ ${PV} == "99999999" ]] ; then
-		emake -j1 html man || die
+		emake -j1 html man
 	fi
 }
 
 src_install() {
 	into /
-	dobin ping || die
+	dobin ping
 	use ipv6 && dobin ping6
-	dosbin arping || die
+	dosbin arping
 	into /usr
-	dosbin tracepath || die
+	dosbin tracepath
 	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die
+	dosbin clockdiff rarpd rdisc ipg tftpd
 
 	fperms 4711 /bin/ping
 	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6