| 1 |
commit: c67efb046779f7956bd882565a6f67fa85011f6c |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Oct 28 20:48:13 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Oct 28 20:48:13 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c67efb04 |
| 7 |
|
| 8 |
net-misc/iputils: remove unnecessary patches. |
| 9 |
|
| 10 |
net-misc/iputils/Manifest | 4 +-- |
| 11 |
...ls-20150815-remove-rdisc-glibc-assumption.patch | 30 ---------------------- |
| 12 |
.../files/iputils-20171016-scope-delimiter.patch | 14 ---------- |
| 13 |
net-misc/iputils/iputils-20171016_pre.ebuild | 2 -- |
| 14 |
4 files changed, 1 insertion(+), 49 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest |
| 17 |
index 29e3eee..7ac688e 100644 |
| 18 |
--- a/net-misc/iputils/Manifest |
| 19 |
+++ b/net-misc/iputils/Manifest |
| 20 |
@@ -15,9 +15,7 @@ AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f1 |
| 21 |
AUX iputils-20121221-remove-rdisc-glibc-assumption.patch 770 SHA256 0639fca129c3e2ca57a7e0f0d3392474665e11f139cfa9362a365b3fca9593b2 SHA512 2ed65a0c0188cf6e06bfb5e3795fa720f7e7040533adbc1ce0c5ded435b823792790890826fc4250a6b2fba16576dc024c50d1faf9598f2fe36aadda77db8a36 WHIRLPOOL a656ae24a99bc5ee6356375be963324eb7fae6aa533e3a572f95bb4695200f2f66d2fa36e037a3c55ce95dcc1643bde4f80326c3cd32ccd53754dde639a1cbd8 |
| 22 |
AUX iputils-20121221-strtod.patch 1133 SHA256 461a883439a09854b483bce02187aa78eb16cb88364a834257d52f00ca4941cc SHA512 2e4dc1bdc8192c7c028bacb7f82fc13de2529f1dfdba71bbb05f04b468a609b343f8e1798bf991a1326d03a701428256960b2c0b7601bc84b50076b64c5ee946 WHIRLPOOL c781f7cab0d0910a48f91eb24647c0fda29b986ed11d35b1f275fb9cc6c1c2e53c0ea062668fed2d560a6bac751d7fa7f50b907324a79bbe560cffc65078833a |
| 23 |
AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf |
| 24 |
-AUX iputils-20150815-remove-rdisc-glibc-assumption.patch 803 SHA256 328cd59dc3046b078544e7aa7173bbcbc564c887c4cf04cf2b28a9158ef02118 SHA512 a4babd90df642c13c77186f84a5742420118dcf3d351ccd13ae287a166e331b050af62d9ab617af404957286bff8676c6109e813dc64781b571d6f7daea6ce1d WHIRLPOOL aa2d39d7bcf9fabd39cfc1079ed6893ac4d4feaa7074c856af07db569c2f7e369e765c4736a46aca4675b49e4e28b07657ca663546b9d9cafdcda20377579e20 |
| 25 |
AUX iputils-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch 2328 SHA256 54f8db1ec0327a05cb3316a8089f506a249d42dac8420dcde5ecf18acc04bef8 SHA512 d2b3c68a9297e22ab033b5126adabe397201f6a84d6f0105233c20746b0826e6ed7318bba30f637ad4f3a19e1812a2a5a02c2eaafcc824b445f58518b8b1d408 WHIRLPOOL 4f34a35c8918951aaf0916f724901d4f9afc98a10a28e28f72f76fd7686610007c8c216ed794f161962e4f9588bc52a15e094cab2c17b4c1decfa8210026e0b5 |
| 26 |
-AUX iputils-20171016-scope-delimiter.patch 582 SHA256 850b3c699ec0dbb01ce90b13981d5670ea9af00c2c3af6390289e9f3182f5f01 SHA512 313d47f18dcd1320de59c9bde0ee8baa2817c1145b5ee9aa6c6c6663a0072a2525589c0c2d282db2726d63a81716926a4ce2d841ffec2cc35229174c75e237ec WHIRLPOOL ee3d0f1296931b6dcdf4577f91b96acf4277bea49d85926ed189aacb11856d65d348c0a200a588c44a02e62c21bea33d1f4ae96b597b23f7328059f1c83fef64 |
| 27 |
AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3 |
| 28 |
AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df |
| 29 |
AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e |
| 30 |
@@ -31,5 +29,5 @@ DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935 |
| 31 |
DIST iputils-s20151218.tar.bz2 157187 SHA256 549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1 SHA512 4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c WHIRLPOOL e5b1d89eeaf64c2be97217eff37ef9aea33f69925683067c5366eb8db30a0b8cd8e96c2c18eedb573c965a6508efcb9e67effa66da1ad8bd606a1c1ffff9adf7 |
| 32 |
EBUILD iputils-20121221-r1.ebuild 3200 SHA256 c8366b5fd040eb4224264cb0fca20d17bf89a27658d8196ed5e461c31fc48ce8 SHA512 545f22070d3d9fab6e284247046e3eb65d3a80f19ca35f6ef55a1839149893ebd7a5c04ec5f63ef28e150d52f9a8ec227e43417e2bd595bd6fec9545ebe15a36 WHIRLPOOL cd71680060b158c67a32846d8911b7d348ab04eb6235ce3d752c8a4c3bccfaee113f2926cfdecc4374779e934e66f6dc17a13fa9c79ce20ab5dd5d0469eaf22b |
| 33 |
EBUILD iputils-20151218.ebuild 4329 SHA256 fd5dcdbd604f900d2829a8c4ce508825a7f429359459506cf9f7a5aae8a466ad SHA512 a270c3377db404b44bb5b38b220f6ba2c05f51e0807cf998741ef7fa60a929d566121e09fa0a8b6b835ae58f84f322b990268525ee230a254d14792f1c8edafa WHIRLPOOL c2a22e6dfe5bc9beb91efcd97061e08ab83e7356a5a2f8f8e0579925110396afd98ad4ed045296eef4b87cd45104a7d6ea9d06bcbb04c6388bcd92f93acf859a |
| 34 |
-EBUILD iputils-20171016_pre.ebuild 4236 SHA256 a1e0877f390ef0c051e1f19b3d78149d577002e978270d270e569f4dfef90720 SHA512 86a987d028e52638cec8fceedc2fcdfb4b503378fa1a4e0cb8aa10b28ec30ebca9c318ceab60c9c3cfc74f51642dc63bd529dbe86542722a0aa2d993e981a0dd WHIRLPOOL 8cf1c251e369fba0350b7a92e9c0ad6291de8d43f7582072c474ebf69618eeac45ec3e05f54bf25ce22ee75fa09f2c79950ff41c82ef5206ea428ebcb6bd124e |
| 35 |
+EBUILD iputils-20171016_pre.ebuild 4118 SHA256 e55991be28d97bf98255fb503b98048d084ab43898657366f70657411dc0b4d8 SHA512 2cfa3ea5aec85473217d73f03d0e8899269b119cff04c0d5088f2167442b5a59723f62ef3b1454cffa6a8018c58989643bd0001c8622f171174ead30ebe476d6 WHIRLPOOL 7e951416c9e681acd2edd66549eb11cd181b6234c29aa5ed1fe3d2cf7ce33d37281f7b1687efa4516fa9c3c203aea8229db54757e79f7e4a3a8837fa9967ee31 |
| 36 |
MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e |
| 37 |
|
| 38 |
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 |
| 39 |
deleted file mode 100644 |
| 40 |
index 8013c3e..0000000 |
| 41 |
--- a/net-misc/iputils/files/iputils-20150815-remove-rdisc-glibc-assumption.patch |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,30 +0,0 @@ |
| 44 |
-diff -Naurw iputils-s20150815/rdisc.c iputils-s20150815.new/rdisc.c |
| 45 |
---- iputils-s20150815/rdisc.c 2015-08-15 07:07:28.000000000 -0700 |
| 46 |
-+++ iputils-s20150815.new/rdisc.c 2015-10-05 14:41:28.963384717 -0700 |
| 47 |
-@@ -115,26 +115,7 @@ |
| 48 |
- |
| 49 |
- #define MAXIFS 32 |
| 50 |
- |
| 51 |
--#if defined(__GLIBC__) && __GLIBC__ < 2 |
| 52 |
--/* For router advertisement */ |
| 53 |
--struct icmp_ra |
| 54 |
--{ |
| 55 |
-- unsigned char icmp_type; /* type of message, see below */ |
| 56 |
-- unsigned char icmp_code; /* type sub code */ |
| 57 |
-- unsigned short icmp_cksum; /* ones complement cksum of struct */ |
| 58 |
-- unsigned char icmp_num_addrs; |
| 59 |
-- unsigned char icmp_wpa; /* Words per address */ |
| 60 |
-- short icmp_lifetime; |
| 61 |
--}; |
| 62 |
-- |
| 63 |
--struct icmp_ra_addr |
| 64 |
--{ |
| 65 |
-- __u32 ira_addr; |
| 66 |
-- __u32 ira_preference; |
| 67 |
--}; |
| 68 |
--#else |
| 69 |
- #define icmp_ra icmp |
| 70 |
--#endif |
| 71 |
- |
| 72 |
- /* Router constants */ |
| 73 |
- #define MAX_INITIAL_ADVERT_INTERVAL 16 |
| 74 |
|
| 75 |
diff --git a/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch b/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch |
| 76 |
deleted file mode 100644 |
| 77 |
index a73bc97..0000000 |
| 78 |
--- a/net-misc/iputils/files/iputils-20171016-scope-delimiter.patch |
| 79 |
+++ /dev/null |
| 80 |
@@ -1,14 +0,0 @@ |
| 81 |
-diff -Naur iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c |
| 82 |
---- iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf.orig/ping.c 2017-10-16 01:44:15.000000000 -0700 |
| 83 |
-+++ iputils-67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf/ping.c 2017-10-28 11:48:03.198321306 -0700 |
| 84 |
-@@ -77,6 +77,10 @@ |
| 85 |
- #define NROUTES 9 /* number of record route slots */ |
| 86 |
- #define TOS_MAX 255 /* 8-bit TOS field */ |
| 87 |
- |
| 88 |
-+#ifndef SCOPE_DELIMITER |
| 89 |
-+# define SCOPE_DELIMITER '%' |
| 90 |
-+#endif |
| 91 |
-+ |
| 92 |
- static int ts_type; |
| 93 |
- static int nroute = 0; |
| 94 |
- static __u32 route[10]; |
| 95 |
|
| 96 |
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild |
| 97 |
index d681f2c..d6bbffd 100644 |
| 98 |
--- a/net-misc/iputils/iputils-20171016_pre.ebuild |
| 99 |
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild |
| 100 |
@@ -63,9 +63,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}" |
| 101 |
|
| 102 |
PATCHES=( |
| 103 |
"${FILESDIR}"/${PN}-99999999-tracepath46.patch |
| 104 |
- "${FILESDIR}"/${PN}-20150815-remove-rdisc-glibc-assumption.patch |
| 105 |
"${FILESDIR}"/${PN}-20171016-missing-AI_IDN-AI_CANONIDN-NI_IDN.patch |
| 106 |
- "${FILESDIR}"/${PN}-20171016-scope-delimiter.patch |
| 107 |
) |
| 108 |
|
| 109 |
src_prepare() { |
Archives