From 29d517fe273c9841720e339259b18ce706c419f4 Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Sun, 8 Jan 2017 20:38:23 +0100 Subject: [PATCH] dev-util/cargo-0.15.0: Use newer versions of openssl and libgit2 crates The previously used versions of the openssl, openssl-sys and libgit2-sys crates are incompatible with LibreSSL. This issue has been reported to upstream. --- dev-util/cargo/Manifest | 5 + dev-util/cargo/cargo-0.15.0-r1.ebuild | 184 +++++++++++++++++++++ .../files/cargo-0.15.0-bump-openssl-to-0.9.5.patch | 183 ++++++++++++++++++++ 3 files changed, 372 insertions(+) create mode 100644 dev-util/cargo/cargo-0.15.0-r1.ebuild create mode 100644 dev-util/cargo/files/cargo-0.15.0-bump-openssl-to-0.9.5.patch diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest index f278d3bdd6..3dadd6855c 100644 --- a/dev-util/cargo/Manifest +++ b/dev-util/cargo/Manifest @@ -40,6 +40,7 @@ DIST docopt-0.6.86.crate 41141 SHA256 4a7ef30445607f6fc8720f0a0a2c7442284b629cf0 DIST env_logger-0.3.2.crate 5144 SHA256 b6bbe7c0b619c81b9a1fd122ab3c7ef19a7b27cdba3c8486314b6f275ca211a4 SHA512 ad6c4da0f2bcf12fa770419bf21d8fb91654bf4527e9c13904f738a4b56e1a07a56ee5068e83939e15eef4354a0fa8981a7aba70ca3e6f1c3fa2658e2fa29630 WHIRLPOOL 09bad00e5b37e9a1260cc602d26b138566589b6e0efbb2abea312832bacd2825d942c2587158f6c365da8c6a78864acbb4b398ccf0cf922bd5669d5af6867c8b DIST env_logger-0.3.4.crate 5641 SHA256 82dcb9ceed3868a03b335657b85a159736c961900f7e7747d3b0b97b9ccb5ccb SHA512 e0fa4ad8c864cab681ebb3cec3ca5b4785c724e63db5f97699c5f03dad63c6233349267571737480c7ea047eea54edf976bd7230793682f553d3ad1c1e866fcb WHIRLPOOL 3ff672abc32629c2017e4d1dacd97c92c841b340cbde9f43a08ee5ed36ef0795a8f0ee39f2b64bc1a0594b52dc87117e68d4dd78e6113f169aaaae6de2a9a300 DIST env_logger-0.3.5.crate 5950 SHA256 15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181 WHIRLPOOL 21b4c81d96e5a8ccbda8491df42db9144acf41f4a25b1f510d8af7d46c931a28e089615692d46d9eb73c511a9cacfb59a15a5647ed1eea6d17ef9a973d99f5a5 +DIST error-chain-0.7.2.crate 17208 SHA256 318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f SHA512 7a29d11b57a8c88d8ea347f80f71f9c4ce0b022fcd563f3ced973d6e008f1c0ffcb958bac4108cb02739547a334d6473d7aa20f66feabf06c68f82dab23e1de4 WHIRLPOOL 703381dd5de1ddcc917220b896ebcdfad1664f8371ea5f2103b02b64a32b3d1c594b60b02c1da0011db58fe9c35cb77dcf2323d2f089f3d9bcee5da10ce9460f DIST filetime-0.1.10.crate 8884 SHA256 5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb WHIRLPOOL 2af8d65033a9cef609d6688a32953c8ec9ac591ed6c357b62f86a028124d1a0c50199daadf839079771c00b4201971bacecc3928094fd77f9d4c872be8e01c10 DIST flate2-0.2.13.crate 45773 SHA256 f9e6fc69e0509336ff58a2e5ab91c7a9629cb78bad26e67d8c4489f5a648addb SHA512 68b35b7e1e3a8c637497220be69add34fc63a98689545ff69c7ff51d34ea79388a781aed078566d55f262f34abf5ee1c63e56017b7a5240cf1144a9285a7ad82 WHIRLPOOL af6b03203d320c0d6c988b5521ef8b80565af5be0b33da4abb62d212621b381e5f81a3095a85f649b97ddea14d6ed47106365655dc3b6753edf6a6cc7f1d6fff DIST flate2-0.2.14.crate 46692 SHA256 3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb SHA512 efe87214a33557ba7f3c255de21f8e556402f947bf7fdff36d4fa98999811bf92efcffdfb53bb1612a8c995673ef423d66906f740875b2213a2fb78306ed0340 WHIRLPOOL f287cd8904600e80337895cf91d705053a9b4a810c199444cdf50b18c45d1fdbb295b31fde7309caf64ed7b91775bfbbcaafdfc026e59f1b11bd82f7c6317d90 @@ -71,6 +72,7 @@ DIST libc-0.2.8.crate 76683 SHA256 52f45f4d4d75de96cf7f8b0e37b6a8e2f96619749b80b DIST libgit2-sys-0.4.3.crate 4132633 SHA256 dc885e2d96f8df06bff0814e6a50a9e93af7ab188474c43d3770ca204e4c8202 SHA512 0011edbd6da1a20b4a68a39f47b9078a1d56ab0d1079035857623dcd8d1b304cc310a938393580818beef10f7dee586a13559c74e5c36deb0dc87a65111adf73 WHIRLPOOL 3761494e581d56a32b186de5f3b67e090fa59961e5984eff602f9eb2db93d4f34935ceb432e2ffbfc80f5cf023209ba5eb5bf4bb39aa69521c87663a3149f9de DIST libgit2-sys-0.4.5.crate 4133755 SHA256 3293dc95169a6351c5a03eca4bf5549f3a9a06336a000315876ff1165a5fba10 SHA512 4a889dadcaff5d75845781f67c715b85a4ba2f556cbdcfbfc443236c3993ebb45cdba11aeee0dcc157d817d468eedaf7ab1ad6ef23225a420f7bfefc9ffe5ea9 WHIRLPOOL 2bacf0816f646ed35bbabf0e1fb90e2df1d5d5624720c0c63f2952393dfcd4245a30eabdb2081a5863d4aa19d1f53a31900484cdee5e313db7c0126926dc1181 DIST libgit2-sys-0.6.4.crate 4210492 SHA256 b4a72539122e79e54cc5c4d5a7a5b53f03b667f7c22c7a0440433e658cf0440f SHA512 7fdeed9d7070518ac39fd77bad57f5ec2c4ef1043c49d97c679555d36ac50d26ce430fe3fc051cbfb619a4a62908a0b5ab1a52bf8edca1ec96f332621b312e68 WHIRLPOOL bc985279ca77b2e9ba736b320a00dfcfc27486fefd15704d085660b9e64b231ad6e0bba8aecf59a91daf450b9dc9428d8174ddb73c1676cfacbf6210fce319e1 +DIST libgit2-sys-0.6.6.crate 4216277 SHA256 c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c SHA512 6cbef4a910a752b9ad4489f45f0d04ae15a68d647f054352896d0aa50513ad1f13bd02902caa814ff8aa2331d9c786aa200ba384ed3239bcee52678d4e928e61 WHIRLPOOL 9397a45aa8313fc213468e252aabd373d5a88c88313d0b777426c502948c52ac3d0739ded4882262adb5f7d075218e7f5f4c7cf60c7cf5cc33ba133dee614f30 DIST libressl-pnacl-sys-2.1.6.crate 2697179 SHA256 cbc058951ab6a3ef35ca16462d7642c4867e6403520811f28537a4e2f2db3e71 SHA512 b4e315900e88d4e00b99c76388658f1b1e6761dc4b9de72804dc9ab946a2fb1bcdb8711de0c99a123f3180143c55625cafbec9db69837d2d5e1a79b2df87d983 WHIRLPOOL 7b43eb64694c187ef3c915406f3a1b016b6441a1c8814653564487fd5d14afb6b840b6ce2a49d2ab4918e9be1f129814390c8b07d64ddf1d7795838e3519c833 DIST libssh2-sys-0.1.37.crate 337082 SHA256 c45fba84ee1fa05b830cb471741ef30d41eb1c3b97160b8ad8d955af824de880 SHA512 025fb2be5a4ca4d77d756e905fc1bb86edc78dc576a6a3c976053c7787edfb45dc856c4c1379895f7df533f40119125c1735e10ebe371678d65025262cf454d2 WHIRLPOOL 519d26caa17cf7c00b5dd519aa9978cba9f4d62cb0cc8ce4679d8b58f250c26252cd1e49293c3d551e968b0b439178577a112fcc9a80118699302582aec2e8da DIST libssh2-sys-0.1.38.crate 331064 SHA256 49c845f8fad4f5761d1018dd0dba8ca49934cc7c97a8473ff20a2f181cda830c SHA512 e217b7529549a4021be8ac6139a7aed2b5e4050b39f2191981c8eb5cafee64cee6209574f25ea21e11038733fee052b907fb748a1ab4c2afb25ded605902692c WHIRLPOOL 79bddad935896e96025ee49ba1f5918a54d957926be736b4775492445ed8b094cc01e2d1acc6ef8d50e9a7bad820683390649270e227cde3714baab25567751d @@ -86,6 +88,7 @@ DIST matches-0.1.2.crate 665 SHA256 15305656809ce5a4805b1ff2946892810992197ce127 DIST matches-0.1.4.crate 1530 SHA256 efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1 SHA512 a0248296a155fd3132150dcd95d3e51b62cf7b99a8530f0c2ea34455a224613bd7a2d1803fbbe1627aedf826e82e746495df319b62f1189e361c9fa1cd8a380e WHIRLPOOL 06386045c0bc87da223f0590c01225b4b811c9921a3107cbd924fd0caca33d53f5278b7378438c9951f5ba037f533e05ef00a6b056f417d5d0118c4a7174fb42 DIST memchr-0.1.10.crate 6771 SHA256 c98adb597263e245c6ffe48dc50d338b51acb8cc53e8e7b3e9c21f53c0a411cb SHA512 51e1368e3bbfac1f5edb12e7cf8821e9ea0d76b822f49c631f741900a2c170f8959fc007ca054e0ddd7349b29ffe03c3f244b967e2aa5f22b332c8d4cf1c204e WHIRLPOOL b8f890c73401152cbd233e160669f2cd6aa1b5408a98a7db31bec786570b27a6100ebe7be9df93d7ea4f420005c812a0fd825dc16891cb967799a4a6378a0fe6 DIST memchr-0.1.11.crate 6977 SHA256 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab WHIRLPOOL af0984d7e8084cc1aef94e486506a0fad9ec81d7be505233343e9fdad2ef0627a4d33bf99c2923959f9604326713ea24a01e2581aaa91249574b6c6d1a6d01a3 +DIST metadeps-1.1.1.crate 2767 SHA256 829fffe7ea1d747e23f64be972991bc516b2f1ac2ae4a3b33d8bea150c410151 SHA512 fec3e82e44854b6dc4f4322727f33f2afc5e676c5fee728f299240c3eb40595bed5a46afe75f51fa7f6a32f97e12bfddd04bed92981d7ccaf9d26400b72f0dea WHIRLPOOL 4363326ee702fc1c8af2b3f4a72ee09d06491e1f1d70fc4ae8623d6df66c780660fc093697da9822891f2cc6613305db5f463b158be5f48a264d3cd9051cbb3c DIST miniz-sys-0.1.7.crate 53361 SHA256 9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54 SHA512 30fbd5a040cc55642a023ac45915081af5b91c7929e1d5c27f15aec6fbd714886d17b8d41396ab13329f150288fae52a1ec21e41fc3e660fb1a6bd388b38b028 WHIRLPOOL ef69781aa8ccbcce8b5ba8519233a1fcc47b9459b21a9fd1d4e48d5ac58496e5eb382b94b5b671e152531293c74121ae0ceb46ab38dbdca2377a63cf52ebea31 DIST miow-0.1.2.crate 18425 SHA256 4e93d633d34b8ff65a24566d67d49703e7a5c7ac2844d6139a9fc441a799e89a SHA512 683aab6eb8dcf07756c227a490f887aa59e5737ca89a3b47b6c311a0f033e45b751bfa5e2a3c23bd861e616944b17b447e88c166f4c9855d5bb4401ec981d4c0 WHIRLPOOL 438382c795d812898a9b7087bfaf8bae607d26041d74e50bd5ddb4f5d24dd42f2a9b76b68699050419e66151c5e18fa2cf9d6817a975ec6f6a289fce76207bd3 DIST miow-0.1.3.crate 18874 SHA256 d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a SHA512 e1e8be24dc4dc81a52f94d7b779d9ae3950ea5a5f74d1b64ecaa04e556c5f1a8a84058bb3388836369e15c44621f5193003499420cce3098503c47da1b374392 WHIRLPOOL c99dbaa1595a39ce5fcac846f03f30cb311db80719214dd57ead611fe2b680ff58f178219a3b4e1f9b6a43d894793b7bba4a59f0f1c926bdb5a8b5ea66cf2822 @@ -111,10 +114,12 @@ DIST num_cpus-1.0.0.crate 5959 SHA256 a859041cbf7a70ea1ece4b87d1a2c6ef364dcb6874 DIST num_cpus-1.1.0.crate 6381 SHA256 8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad SHA512 31999bdbda7e1ca02a4a276a47f4b61e56dbb8987747de7b6850d5c9f21e0b8c541b5fa9fd07203c8790e6bcc6ffcf9167270dd2fc9716396b8d3cb2b88bebf1 WHIRLPOOL 3006f0b30a90218aacaf9004ab68dd306ceec22caa1ab5ccb01fa9a4b1a9ef998da3bddd3514466d8d5529a74a2870a9190415460f390987694253acc93f1d0c DIST openssl-0.7.14.crate 63824 SHA256 c4117b6244aac42ed0150a6019b4d953d28247c5dd6ae6f46ae469b5f2318733 SHA512 e36943d907d1846a619250de6db1b3e48ca729a34bcb21ee7f47ab1ee5535682ba8b8f73e60e3321e6ae321114891c9e98bdf0af1685175c1fa342b84e9ce33d WHIRLPOOL 94540fec4fe3b6e1fefac6f37737238195f33cc96f48d5bde0925e4135c6e6143701ca89be033e3bb637acfd599fce08b43288697c33364f4e339ec658e54d0f DIST openssl-0.9.1.crate 80149 SHA256 1eb2a714828f5528e4a24a07c296539216f412364844d61fe1161f94558455d4 SHA512 8f3fa912e16b203f8dea3815bcf72ad80645dc7ec69c74cb0aa5ef30a69b14577fe292a1fe7d7aca5163098bf4789deae7cf99c4bea3b3f48cf7e5513f3b63aa WHIRLPOOL 5d06da635f9a720055f62191e84aac48a57160d43c39a43b31c2afb47b16b84c05adceb0d5a48ebe9118122d117a8419c6828c3568a38e6c8db4dec118f454a5 +DIST openssl-0.9.5.crate 85595 SHA256 6a324049c1cf6496421e033daf0a460bc17cc1de11b421568492e2b1fd57a710 SHA512 bc1304ab30319876f576c4a4b6ec6e0e715f4ceea79836988f1348328049be9cea5e1939cb9fc3d0e67d8b2d1e9dcce6f630282dcfc921f69c9d2c4935dc2246 WHIRLPOOL 565864848b22151c08661b97a3d705a7bf3a703c265dca942b98cf3dd36cd8aa179140b53d3e12e7b70ee33d475f7e0e21a6bc67841a1a94505b8e9839ebf83a DIST openssl-probe-0.1.0.crate 5638 SHA256 756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919 SHA512 044a4fd477420a511a01971b3e0373971b7c06f4a8e3f039745a71b84c652048437260d608997ee2499e0afb886e8dc637e9086545075eb3ea6979967d937c10 WHIRLPOOL 3865605b22292d5d65a279cc649c56dff90648802f73cc72bad8e34dcd0a3b43f14b443980d08a5cd13b6c86b1d24dae2f67f8b966c4d5652712f8e2a13430b2 DIST openssl-sys-0.7.14.crate 10156 SHA256 b8ac5e9d911dd4c3202bbf4139b73bc7a1231f7d0a39432c6f893745f0e04120 SHA512 854c7b4eb61db814d30a261aa7c56899101d158b7dc20402064a5d5b51a8bd3f6a8b851ba39049c8860060e13b71be6d7db3d9dfc3175383fbeb5c1b120cbe93 WHIRLPOOL 20a5957e797eee1d88073ea2d7818c7d193ad2a7049b9e82f292db311cd4866b9a33af888d58ec39602eb8ed7423708cc90a688ea6ce829fc85e034157b6b66e DIST openssl-sys-0.7.8.crate 9668 SHA256 065e99c2dca7abfe305bd8254d221952b46d47ea9a1c85b6d674c38f083765e6 SHA512 4d5000b4ee64bd67c749cad35fe41c3a8f7a375c647faacc0e3b7f140c0c21ed7b022e3233c2b420ce45c6bf2722720feebe74bab9076a21e1026a6b6ff2fc49 WHIRLPOOL d01a227dd5d940baa313a885c1d7020e1baa212fc01d4020588e5f91a0045a7dd6c6d830d60bb32ff4d1171c01f944eb87b9928f569994e5db3052ca313774ae DIST openssl-sys-0.9.1.crate 25655 SHA256 95e9fb08acc32509fac299d6e5f4932e1e055bb70d764282c3ed8beaa87ab0e9 SHA512 5ec32c40d96b696b954e2a451f6840ca17ba0c9f59fe24e55708075a6615fddb6ab403058b45ffe1acbc0e8d0e418fc47fcff09c65bae56203e98b1e240814ea WHIRLPOOL 2a94176bbaaf867edd0b7db0df5e2214e7fd8faf6134379cda6cdc52d8f93400c455f6a865bd75557402f1f8389dea965a103f02a799ab59bf0266be702b91dc +DIST openssl-sys-0.9.5.crate 27637 SHA256 4e38c5a9261a179e63757eee43a1ee63f9033a2e99b8147aa4c245857a995af7 SHA512 e0315c344846db1a6c313135e42b85c4ecd700dd48c77ccec39103aab528fc54bc82540cd150eafd081df6b992467f1ccc438daf21227ea7cd04d389d452a447 WHIRLPOOL b98942b1035616d4cc92fb859f0ac5aededc0bb134554a11e373b0cb4e99f01963739c1a86eff0ae0529d109603be34675b77ef4b80fd0d0b4d3e22025ca2d69 DIST openssl-sys-extras-0.7.14.crate 3871 SHA256 11c5e1dba7d3d03d80f045bf0d60111dc69213b67651e7c889527a3badabb9fa SHA512 3fdbb09fff2e75cbb2a7e8e279930010df0ca478376afc15c9b2e15259ee7167ac7d59c36c209f95a17b284b42352d4527302ba1118ecd70295afa84422269f8 WHIRLPOOL 5332014495ec97645aedbecd750e318797722108e4e8075a2ebbb4aca9552e861c2d2320b5e6e148108c2828c86d94ff865450d0137c28ce817b6da683a0945b DIST pkg-config-0.3.8.crate 10814 SHA256 8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77 WHIRLPOOL b8921e822910523910fb1e9437dedecf55f640bec605f96cade50783f58ace3f8931d76f5a573b3c0ebd5f4134268d17eb7dcff134accf88a880b9064e67680e DIST pnacl-build-helper-1.4.10.crate 5470 SHA256 61c9231d31aea845007443d62fcbb58bb6949ab9c18081ee1e09920e0cf1118b SHA512 c170589b379378a4f33ee1ae40de6f649d573e9c9288ad9603a958c9dedf04f09b268539e922a91c060f40374bb697f190fde055ea057de57bfae2308b512707 WHIRLPOOL 9d2da27d66ddc14f31e4815f6ff5b7daa099b37d23bef73d4c3edef4da2b9eb322c646d1acd404db29f4eb9a3c1382fe0f15f0e034af6138cd030f6f8f3f9f12 diff --git a/dev-util/cargo/cargo-0.15.0-r1.ebuild b/dev-util/cargo/cargo-0.15.0-r1.ebuild new file mode 100644 index 0000000000..752ae670c4 --- /dev/null +++ b/dev-util/cargo/cargo-0.15.0-r1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +CARGO_SNAPSHOT_DATE="2016-09-01" +CRATES=" +advapi32-sys-0.2.0 +aho-corasick-0.5.3 +bitflags-0.1.1 +bitflags-0.7.0 +bufstream-0.1.2 +cargotest-0.1.0 +cfg-if-0.1.0 +cmake-0.1.18 +crates-io-0.4.0 +crossbeam-0.2.10 +curl-0.4.1 +curl-sys-0.3.6 +docopt-0.6.86 +env_logger-0.3.5 +error-chain-0.7.2 +filetime-0.1.10 +flate2-0.2.14 +fs2-0.3.0 +gcc-0.3.38 +gdi32-sys-0.2.0 +git2-0.6.3 +git2-curl-0.7.0 +glob-0.2.11 +hamcrest-0.1.1 +idna-0.1.0 +kernel32-sys-0.2.2 +lazy_static-0.2.2 +libc-0.2.17 +libgit2-sys-0.6.6 +libssh2-sys-0.2.4 +libz-sys-1.0.10 +log-0.3.6 +matches-0.1.4 +memchr-0.1.11 +metadeps-1.1.1 +miniz-sys-0.1.7 +miow-0.1.3 +net2-0.2.26 +num-0.1.36 +num-bigint-0.1.35 +num-complex-0.1.35 +num-integer-0.1.32 +num-iter-0.1.32 +num-rational-0.1.35 +num-traits-0.1.36 +num_cpus-1.1.0 +openssl-0.9.5 +openssl-probe-0.1.0 +openssl-sys-0.9.5 +pkg-config-0.3.8 +psapi-sys-0.1.0 +rand-0.3.14 +regex-0.1.80 +regex-syntax-0.3.9 +rustc-serialize-0.3.21 +semver-0.5.1 +semver-parser-0.6.1 +strsim-0.5.1 +tar-0.4.8 +tempdir-0.3.5 +term-0.4.4 +thread-id-2.0.0 +thread_local-0.2.7 +toml-0.2.1 +unicode-bidi-0.2.3 +unicode-normalization-0.1.2 +url-1.2.3 +user32-sys-0.2.0 +utf8-ranges-0.1.3 +winapi-0.2.8 +winapi-build-0.1.1 +ws2_32-sys-0.2.1 +" + +inherit cargo bash-completion-r1 + +DESCRIPTION="The Rust's package manager" +HOMEPAGE="http://crates.io" +SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES}) + x86? ( + https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-i686-unknown-linux-gnu.tar.gz -> + cargo-snapshot-x86-${CARGO_SNAPSHOT_DATE}.tar.gz + ) + amd64? ( + https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT_DATE}/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz -> + cargo-snapshot-amd64-${CARGO_SNAPSHOT_DATE}.tar.gz + )" + +RESTRICT="mirror" +LICENSE="|| ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="doc libressl" + +COMMON_DEPEND="sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-libs/http-parser" +RDEPEND="${COMMON_DEPEND} + !dev-util/cargo-bin + net-misc/curl[ssl]" +DEPEND="${COMMON_DEPEND} + >=dev-lang/rust-1.9.0:stable + dev-util/cmake + sys-apps/coreutils + sys-apps/diffutils + sys-apps/findutils + sys-apps/sed" + +src_prepare() { + eapply "${FILESDIR}/${P}-bump-openssl-to-0.9.5.patch" + + eapply_user +} + +src_configure() { + # Cargo only supports these GNU triples: + # - Linux: -unknown-linux-gnu + # - MacOS: -apple-darwin + # - Windows: -pc-windows-gnu + # where could be 'x86_64' (amd64) or 'i686' (x86) + use amd64 && CTARGET="x86_64-unknown-linux-gnu" + use x86 && CTARGET="i686-unknown-linux-gnu" + + # NOTE: 'disable-nightly' is used by crates (such as 'matches') to entirely + # skip their internal libraries that make use of unstable rustc features. + # Don't use 'enable-nightly' with a stable release of rustc as DEPEND, + # otherwise you could get compilation issues. + # see: github.com/gentoo/gentoo-rust/issues/13 + local myeconfargs=( + --host=${CTARGET} + --build=${CTARGET} + --target=${CTARGET} + --enable-optimize +# --release-channel stable + --disable-verify-install + --disable-debug + --disable-cross-tests + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Building sources + export CARGO_HOME="${ECARGO_HOME}" + emake VERBOSE=1 PKG_CONFIG_PATH="" + + # Building HTML documentation + use doc && emake doc +} + +src_install() { + emake prepare-image-${CTARGET} IMGDIR_${CTARGET}="${ED}/usr" + + # Install HTML documentation + use doc && HTML_DOCS=("target/doc") + einstalldocs + + dobashcomp "${ED}"/usr/etc/bash_completion.d/cargo + rm -rf "${ED}"/usr/etc || die +} + +src_test() { + # Running unit tests + # NOTE: by default 'make test' uses the copy of cargo (v0.0.1-pre-nighyly) + # from the installer snapshot instead of the version just built, so the + # ebuild needs to override the value of CFG_LOCAL_CARGO to avoid false + # positives from unit tests. + emake test \ + CFG_ENABLE_OPTIMIZE=1 \ + VERBOSE=1 \ + CFG_LOCAL_CARGO="${WORKDIR}"/${P}/target/${CTARGET}/release/cargo +} diff --git a/dev-util/cargo/files/cargo-0.15.0-bump-openssl-to-0.9.5.patch b/dev-util/cargo/files/cargo-0.15.0-bump-openssl-to-0.9.5.patch new file mode 100644 index 0000000000..763d415047 --- /dev/null +++ b/dev-util/cargo/files/cargo-0.15.0-bump-openssl-to-0.9.5.patch @@ -0,0 +1,183 @@ +From 1326c29139527c60d66f2235be6d757ca62e25b3 Mon Sep 17 00:00:00 2001 +From: Luis Ressel +Date: Sun, 8 Jan 2017 21:59:37 +0100 +Subject: [PATCH] Bump openssl{,-lib} dependencies to 0.9.5 + +Previous versions aren't compatible with LibreSSL. +--- + Cargo.lock | 49 +++++++++++++++++++++++++++++++++---------------- + 1 file changed, 33 insertions(+), 16 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index df6e987b..00954960 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -19,11 +19,11 @@ dependencies = [ + "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "libgit2-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libgit2-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -119,7 +119,7 @@ dependencies = [ + "curl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -131,7 +131,7 @@ dependencies = [ + "gcc 0.3.38 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] +@@ -157,6 +157,11 @@ dependencies = [ + ] + + [[package]] ++name = "error-chain" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] + name = "filetime" + version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -204,9 +209,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "libgit2-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libgit2-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -266,7 +271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "libgit2-sys" +-version = "0.6.4" ++version = "0.6.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "cmake 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -275,7 +280,7 @@ dependencies = [ + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -287,7 +292,7 @@ dependencies = [ + "cmake 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -320,6 +325,16 @@ dependencies = [ + ] + + [[package]] ++name = "metadeps" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] + name = "miniz-sys" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -427,13 +442,13 @@ dependencies = [ + + [[package]] + name = "openssl" +-version = "0.9.1" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -443,12 +458,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "openssl-sys" +-version = "0.9.1" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -636,6 +651,7 @@ dependencies = [ + "checksum curl-sys 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "218a149208e1f4e5f7e20f1d0ed1e9431a086a6b4333ff95dba82237be9c283a" + "checksum docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)" = "4a7ef30445607f6fc8720f0a0a2c7442284b629cf0d049286860fae23e71c4d9" + "checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" ++"checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f" + "checksum filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922" + "checksum flate2 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "3eeb481e957304178d2e782f2da1257f1434dfecbae883bafb61ada2a9fea3bb" + "checksum fs2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "640001e1bd865c7c32806292822445af576a6866175b5225aa2087ca5e3de551" +@@ -649,12 +665,13 @@ dependencies = [ + "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + "checksum lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6abe0ee2e758cd6bc8a2cd56726359007748fbf4128da998b65d0b70f881e19b" + "checksum libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "044d1360593a78f5c8e5e710beccdc24ab71d1f01bc19a29bcacdba22e8475d8" +-"checksum libgit2-sys 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a72539122e79e54cc5c4d5a7a5b53f03b667f7c22c7a0440433e658cf0440f" ++"checksum libgit2-sys 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c" + "checksum libssh2-sys 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ed089186abb468a78f7170177304751805e33c20e7aef4b8298884ce2080b5de" + "checksum libz-sys 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "905c72a0c260bcd89ddca5afa1c46bebd29b52878a3d58c86865ea42402f88e6" + "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054" + "checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" + "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" ++"checksum metadeps 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829fffe7ea1d747e23f64be972991bc516b2f1ac2ae4a3b33d8bea150c410151" + "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54" + "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a" + "checksum net2 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "5edf9cb6be97212423aed9413dd4729d62b370b5e1c571750e882cebbbc1e3e2" +@@ -666,9 +683,9 @@ dependencies = [ + "checksum num-rational 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "54ff603b8334a72fbb27fe66948aac0abaaa40231b3cecd189e76162f6f38aaf" + "checksum num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a16a42856a256b39c6d3484f097f6713e14feacd9bfb02290917904fae46c81c" + "checksum num_cpus 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad" +-"checksum openssl 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb2a714828f5528e4a24a07c296539216f412364844d61fe1161f94558455d4" ++"checksum openssl 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6a324049c1cf6496421e033daf0a460bc17cc1de11b421568492e2b1fd57a710" + "checksum openssl-probe 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919" +-"checksum openssl-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95e9fb08acc32509fac299d6e5f4932e1e055bb70d764282c3ed8beaa87ab0e9" ++"checksum openssl-sys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4e38c5a9261a179e63757eee43a1ee63f9033a2e99b8147aa4c245857a995af7" + "checksum pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa" + "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478" + "checksum rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "2791d88c6defac799c3f20d74f094ca33b9332612d9aef9078519c82e4fe04a5" +-- +2.11.0 + -- 2.11.0