[patch] Bump openssl crates using PATCHES array instead epatch

cargo-0-20-0-libressl-2-60.patch (text/plain), 12.48 KB, created by Ulenrich on 2017-08-09 12:56:38 UTC

diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index e0b555328af1..c0d566bf6904 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -101,12 +101,12 @@ DIST num-traits-0.1.37.crate 20492 SHA256 e1cbfa3781f3fe73dc05321bed52a06d2d491e
 DIST num_cpus-1.1.0.crate 6381 SHA256 8890e6084723d57d0df8d2720b0d60c6ee67d6c93e7169630e4371e88765dcad SHA512 31999bdbda7e1ca02a4a276a47f4b61e56dbb8987747de7b6850d5c9f21e0b8c541b5fa9fd07203c8790e6bcc6ffcf9167270dd2fc9716396b8d3cb2b88bebf1 WHIRLPOOL 3006f0b30a90218aacaf9004ab68dd306ceec22caa1ab5ccb01fa9a4b1a9ef998da3bddd3514466d8d5529a74a2870a9190415460f390987694253acc93f1d0c
 DIST num_cpus-1.5.0.crate 7684 SHA256 f6e850c7f35c3de263e6094e819f6b4b9c09190ff4438fc6dec1aef1568547bc SHA512 c782859acfeb26e9a335920799a071e9ede34355fd0ae39e708fcc96372da09c3d144267e92f0ff76fb079b0dfb0bce184b9b44fdaa61a15d8916b879376c3c9 WHIRLPOOL 808a4220091b49dd6eb88628116e8cbc35d9d4d88119aeecc1a8c2f7dad872baec5817bef466243af595affafe5a0421ecedecdf70c6a2983986fb7d22f1909f
 DIST openssl-0.9.1.crate 80149 SHA256 1eb2a714828f5528e4a24a07c296539216f412364844d61fe1161f94558455d4 SHA512 8f3fa912e16b203f8dea3815bcf72ad80645dc7ec69c74cb0aa5ef30a69b14577fe292a1fe7d7aca5163098bf4789deae7cf99c4bea3b3f48cf7e5513f3b63aa WHIRLPOOL 5d06da635f9a720055f62191e84aac48a57160d43c39a43b31c2afb47b16b84c05adceb0d5a48ebe9118122d117a8419c6828c3568a38e6c8db4dec118f454a5
-DIST openssl-0.9.13.crate 124078 SHA256 b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586 SHA512 1c61564c238a2a62e9a5cf567deb088feb5c9c595f348fe3ba1a419b69bcdbff6632c3544d49f805ae69a98cc64dd0ac240a24f22cd2da3560868929837b4984 WHIRLPOOL 340cccce8b64f281e0a04d650ddfb73de122aa8dd39bd56900e57b3de9d6abaa641deba24015980a04082c45b5e6cd38b72628374b41f8e048ec42a1413012dd
+DIST openssl-0.9.15.crate 125845 SHA256 f776f1d8af832fd2c637ee182c801e8f7ea8895718a2be9914cca001f6e2c40a SHA512 ee15cc7dbc075cec32ad12b0cc12e99300a967004e8f19c91a16a456519821f29c9ae8ffc95f16e356bc359edee763069e5fb887fadc22547d547b419bc73ac7 WHIRLPOOL 7802d9b01f6fd5b9430ffe26ac2db2b2e344298f63aa9b38b1fdb94d018355d187a58c5fe90bda255f40386b1d07adb0a11522fee37a89678ed9e3e60374297a
 DIST openssl-0.9.6.crate 86211 SHA256 0c00da69323449142e00a5410f0e022b39e8bbb7dc569cee8fc6af279279483c SHA512 dacd50f81e6509e7508a1a74b949b13f3500ab2774c306d4b46a2b48b70c7a3edc41ca321b299be56491469e87bbec5a19320b89f1ae426ef30058b480c111c9 WHIRLPOOL 0c1e6b6338466c049d59514ccd2289ae062cff6aec428f4e02a9c4d5362ea6322ef2e96faf098991859465ea253419ce48541c06e7d528bca276218457d30373
 DIST openssl-probe-0.1.0.crate 5638 SHA256 756d49c8424483a3df3b5d735112b4da22109ced9a8294f1f5cdf80fb3810919 SHA512 044a4fd477420a511a01971b3e0373971b7c06f4a8e3f039745a71b84c652048437260d608997ee2499e0afb886e8dc637e9086545075eb3ea6979967d937c10 WHIRLPOOL 3865605b22292d5d65a279cc649c56dff90648802f73cc72bad8e34dcd0a3b43f14b443980d08a5cd13b6c86b1d24dae2f67f8b966c4d5652712f8e2a13430b2
 DIST openssl-probe-0.1.1.crate 5668 SHA256 d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf SHA512 442617fb5d7f540ff05dc25c7364e180a7f4620848a2eeec31afa5a59ad6ef1924dc6254d24d5c73f356532794ce3cceae353826bb78d061edebd5fdf60296b1 WHIRLPOOL eaeabc41567b6a091abb20da4858aeb89e73f78067a6f9b35c2c3d0e6e0bd74e14a80071fcb2cc3316568dc7d1c1afb901cf49847522c2e1cf9da2fd35a62393
 DIST openssl-sys-0.9.1.crate 25655 SHA256 95e9fb08acc32509fac299d6e5f4932e1e055bb70d764282c3ed8beaa87ab0e9 SHA512 5ec32c40d96b696b954e2a451f6840ca17ba0c9f59fe24e55708075a6615fddb6ab403058b45ffe1acbc0e8d0e418fc47fcff09c65bae56203e98b1e240814ea WHIRLPOOL 2a94176bbaaf867edd0b7db0df5e2214e7fd8faf6134379cda6cdc52d8f93400c455f6a865bd75557402f1f8389dea965a103f02a799ab59bf0266be702b91dc
-DIST openssl-sys-0.9.13.crate 34706 SHA256 e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a SHA512 93066afbf3a3dc05e9b1019f75c5892d31a539d002a3235093a62b6767be148b8fbdeee4671041868973f828c5da4526fa02e14cdbd2c4bb0c77e5a22fa048ec WHIRLPOOL 9d720f848ee1748a4f488ae01a10826cb4d0749124957cc5f543370a367fadc4c391aefdc06608c99fa952f33f9124df0b670698f6ca238b3cbd08ea5658db9b
+DIST openssl-sys-0.9.15.crate 34003 SHA256 ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4 SHA512 ee1fe69b792100049534fced217bdadfe4092920cbfec7c782da7e1db2394552f73c6e80f6bb2eb40ba66b7dfc78f6b5a850e001e8ae3e8de9dfbd9921455818 WHIRLPOOL 2a2e99c9900b895cd7018a817be0e03295621bd23cfc300014d24b04094c8c9967b99616ce4d3e21718f63cb1e80c29772c6d15af91f83482cbca05ab9e9bb98
 DIST openssl-sys-0.9.6.crate 28093 SHA256 b1482f9a06f56c906007e17ea14d73d102210b5d27bc948bf5e175f493f3f7c3 SHA512 b7f3b7a0e0b7cb34c7b1f65efc32738ccf40a2ab93782722a5655cfdb0e2feb566e1a53c8121c6d2e16794f26e817aac1455a39f8c422616fb4660478b339d8d WHIRLPOOL 1b9c5025d0b0b6b2eb3a0b570ceb9c42c7f86bfef3e57c0e3429caeeddc041919118d95d981fa1a4e5065e6701dc609633b021fda317a47838842894fb7a9223
 DIST pkg-config-0.3.8.crate 10814 SHA256 8cee804ecc7eaf201a4a207241472cc870e825206f6c031e3ee2a72fa425f2fa SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77 WHIRLPOOL b8921e822910523910fb1e9437dedecf55f640bec605f96cade50783f58ace3f8931d76f5a573b3c0ebd5f4134268d17eb7dcff134accf88a880b9064e67680e
 DIST pkg-config-0.3.9.crate 11055 SHA256 3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1 WHIRLPOOL 6073177f5b36748407371a8199d6b441c2baef4638157541da2aa370ab249a06ce72e7aba01946f9d44c81f1391e34958b3bf42a64f150b3b7d5148d93026a12
diff --git a/dev-util/cargo/cargo-0.20.0.ebuild b/dev-util/cargo/cargo-0.20.0.ebuild
index 25f1a84adc87..3898b8e3250b 100644
--- a/dev-util/cargo/cargo-0.20.0.ebuild
+++ b/dev-util/cargo/cargo-0.20.0.ebuild
@@ -58,9 +58,9 @@ num-iter-0.1.33
 num-rational-0.1.36
 num-traits-0.1.37
 num_cpus-1.5.0
-openssl-0.9.13
+openssl-0.9.15
 openssl-probe-0.1.1
-openssl-sys-0.9.13
+openssl-sys-0.9.15
 pkg-config-0.3.9
 psapi-sys-0.1.0
 quote-0.3.15
@@ -150,6 +150,10 @@ DEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	sys-apps/sed"
 
+PATCHES=(
+	"${FILESDIR}/0001-update-openssl-crates.patch"
+)
+
 src_configure() {
 	# Do nothing
 	echo "Configuring cargo..."
diff --git a/dev-util/cargo/files/0001-update-openssl-crates.patch b/dev-util/cargo/files/0001-update-openssl-crates.patch
new file mode 100644
index 000000000000..72dd034f081d
--- /dev/null
+++ b/dev-util/cargo/files/0001-update-openssl-crates.patch
@@ -0,0 +1,96 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 8a7132aa..abc37307 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -25,7 +25,7 @@ dependencies = [
+  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "num_cpus 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -162,7 +162,7 @@ dependencies = [
+  "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -174,7 +174,7 @@ dependencies = [
+  "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "vcpkg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -277,7 +277,7 @@ dependencies = [
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -360,7 +360,7 @@ dependencies = [
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -372,7 +372,7 @@ dependencies = [
+  "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+@@ -521,14 +521,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "openssl"
+-version = "0.9.13"
++version = "0.9.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+@@ -538,7 +538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.13"
++version = "0.9.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -913,9 +913,9 @@ dependencies = [
+ "checksum num-rational 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "c2dc5ea04020a8f18318ae485c751f8cfa1c0e69dcf465c29ddaaa64a313cc44"
+ "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
+ "checksum num_cpus 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6e850c7f35c3de263e6094e819f6b4b9c09190ff4438fc6dec1aef1568547bc"
+-"checksum openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586"
++"checksum openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f776f1d8af832fd2c637ee182c801e8f7ea8895718a2be9914cca001f6e2c40a"
+ "checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf"
+-"checksum openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a"
++"checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4"
+ "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+ "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478"
+ "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"