| 1 |
commit: 6e3df00e4facb421c030ec816d39720d797e0449 |
| 2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 2 00:30:06 2019 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 2 18:41:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3df00e |
| 7 |
|
| 8 |
dev-lang/rust: update patch for LibreSSL 3.0.x support |
| 9 |
|
| 10 |
Squash patches for LibreSSL support and update them for LibreSSL 3.0.1. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 13 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/13121 |
| 15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-lang/rust/files/1.36.0-libressl.patch | 72 ++++++++++++++++++++---------- |
| 18 |
dev-lang/rust/files/1.36.0-libressl3.patch | 72 ------------------------------ |
| 19 |
dev-lang/rust/rust-1.36.0.ebuild | 1 - |
| 20 |
dev-lang/rust/rust-1.37.0.ebuild | 1 - |
| 21 |
dev-lang/rust/rust-1.38.0.ebuild | 1 - |
| 22 |
5 files changed, 49 insertions(+), 98 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-lang/rust/files/1.36.0-libressl.patch b/dev-lang/rust/files/1.36.0-libressl.patch |
| 25 |
index 9b176f4decf..cc1ce26c8d4 100644 |
| 26 |
--- a/dev-lang/rust/files/1.36.0-libressl.patch |
| 27 |
+++ b/dev-lang/rust/files/1.36.0-libressl.patch |
| 28 |
@@ -1,42 +1,68 @@ |
| 29 |
-From e6f2c934bc25ec04a61c58c3e0ffb9c5194ee388 Mon Sep 17 00:00:00 2001 |
| 30 |
-From: Jory Pratt <anarchy@g.o> |
| 31 |
-Date: Tue, 9 Jul 2019 09:48:36 -0500 |
| 32 |
-Subject: [PATCH] Update libressl support |
| 33 |
- |
| 34 |
---- |
| 35 |
- vendor/openssl-sys/.cargo-checksum.json | 2 +- |
| 36 |
- vendor/openssl-sys/build/main.rs | 3 ++- |
| 37 |
- 2 files changed, 3 insertions(+), 2 deletions(-) |
| 38 |
- |
| 39 |
diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json |
| 40 |
-index 5c961bcbc..8430a26c5 100644 |
| 41 |
+index 5c961bcbc..a0ea2d357 100644 |
| 42 |
--- a/vendor/openssl-sys/.cargo-checksum.json |
| 43 |
+++ b/vendor/openssl-sys/.cargo-checksum.json |
| 44 |
@@ -1 +1 @@ |
| 45 |
-{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"681a1f8a8f389c82bbd3d2498a3692c201c63db658e7c3d162f09d5d81892fd4","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
| 46 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
| 47 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
| 48 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
| 49 |
\ No newline at end of file |
| 50 |
-+{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"cae729f449030ee86fc8e97215a2639c03f87a44d2399c84be8d41c1a6b624f3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
| 51 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
| 52 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
| 53 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
| 54 |
-\ No newline at end of file |
| 55 |
++{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"f2cd4ca8fde8298211581f9e1ca61668706d7681a38b95a63591450e1d8366a3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
| 56 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
| 57 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
| 58 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
| 59 |
diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs |
| 60 |
-index 02b93b90a..0b8c96dcc 100644 |
| 61 |
+index 02b93b90a..f0cf4b4ff 100644 |
| 62 |
--- a/vendor/openssl-sys/build/main.rs |
| 63 |
+++ b/vendor/openssl-sys/build/main.rs |
| 64 |
-@@ -199,6 +199,7 @@ See rust-openssl README for more information: |
| 65 |
- (8, 1) => ('8', '1'), |
| 66 |
- (8, _) => ('8', 'x'), |
| 67 |
- (9, 0) => ('9', '0'), |
| 68 |
-+ (9, _) => ('9', 'x'), |
| 69 |
+@@ -183,27 +183,31 @@ See rust-openssl README for more information: |
| 70 |
+ if let Some(libressl_version) = libressl_version { |
| 71 |
+ println!("cargo:libressl_version_number={:x}", libressl_version); |
| 72 |
+ |
| 73 |
++ let major = (libressl_version >> 28) as u8; |
| 74 |
+ let minor = (libressl_version >> 20) as u8; |
| 75 |
+ let fix = (libressl_version >> 12) as u8; |
| 76 |
+- let (minor, fix) = match (minor, fix) { |
| 77 |
+- (5, 0) => ('5', '0'), |
| 78 |
+- (5, 1) => ('5', '1'), |
| 79 |
+- (5, 2) => ('5', '2'), |
| 80 |
+- (5, _) => ('5', 'x'), |
| 81 |
+- (6, 0) => ('6', '0'), |
| 82 |
+- (6, 1) => ('6', '1'), |
| 83 |
+- (6, 2) => ('6', '2'), |
| 84 |
+- (6, _) => ('6', 'x'), |
| 85 |
+- (7, _) => ('7', 'x'), |
| 86 |
+- (8, 0) => ('8', '0'), |
| 87 |
+- (8, 1) => ('8', '1'), |
| 88 |
+- (8, _) => ('8', 'x'), |
| 89 |
+- (9, 0) => ('9', '0'), |
| 90 |
++ let (major, minor, fix) = match (major, minor, fix) { |
| 91 |
++ (2, 5, 0) => ('2', '5', '0'), |
| 92 |
++ (2, 5, 1) => ('2', '5', '1'), |
| 93 |
++ (2, 5, 2) => ('2', '5', '2'), |
| 94 |
++ (2, 5, _) => ('2', '5', 'x'), |
| 95 |
++ (2, 6, 0) => ('2', '6', '0'), |
| 96 |
++ (2, 6, 1) => ('2', '6', '1'), |
| 97 |
++ (2, 6, 2) => ('2', '6', '2'), |
| 98 |
++ (2, 6, _) => ('2', '6', 'x'), |
| 99 |
++ (2, 7, _) => ('2', '7', 'x'), |
| 100 |
++ (2, 8, 0) => ('2', '8', '0'), |
| 101 |
++ (2, 8, 1) => ('2', '8', '1'), |
| 102 |
++ (2, 8, _) => ('2', '8', 'x'), |
| 103 |
++ (2, 9, 0) => ('2', '9', '0'), |
| 104 |
++ (2, 9, _) => ('2', '9', 'x'), |
| 105 |
++ (3, 0, 0) => ('3', '0', '0'), |
| 106 |
++ (3, 0, _) => ('3', '0', 'x'), |
| 107 |
_ => version_error(), |
| 108 |
}; |
| 109 |
|
| 110 |
-@@ -239,7 +240,7 @@ fn version_error() -> ! { |
| 111 |
+ println!("cargo:libressl=true"); |
| 112 |
+- println!("cargo:libressl_version=2{}{}", minor, fix); |
| 113 |
++ println!("cargo:libressl_version={}{}{}", major, minor, fix); |
| 114 |
+ println!("cargo:version=101"); |
| 115 |
+ Version::Libressl |
| 116 |
+ } else { |
| 117 |
+@@ -239,7 +243,7 @@ fn version_error() -> ! { |
| 118 |
" |
| 119 |
|
| 120 |
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 |
| 121 |
-through 2.9.0, but a different version of OpenSSL was found. The build is now aborting |
| 122 |
-+through 2.9.x, but a different version of OpenSSL was found. The build is now aborting |
| 123 |
++through 3.0.x, but a different version of OpenSSL was found. The build is now aborting |
| 124 |
due to this version mismatch. |
| 125 |
|
| 126 |
" |
| 127 |
--- |
| 128 |
-2.22.0 |
| 129 |
|
| 130 |
diff --git a/dev-lang/rust/files/1.36.0-libressl3.patch b/dev-lang/rust/files/1.36.0-libressl3.patch |
| 131 |
deleted file mode 100644 |
| 132 |
index ec3cc10f02e..00000000000 |
| 133 |
--- a/dev-lang/rust/files/1.36.0-libressl3.patch |
| 134 |
+++ /dev/null |
| 135 |
@@ -1,72 +0,0 @@ |
| 136 |
-From 4ab0354f7432abcf0b598b475f4616b6aa5d36d4 Mon Sep 17 00:00:00 2001 |
| 137 |
-From: Steven Fackler <sfackler@×××××.com> |
| 138 |
-Date: Thu, 15 Aug 2019 23:30:58 -0500 |
| 139 |
-Subject: [PATCH] Support LibreSSL 3.0.0 |
| 140 |
- |
| 141 |
-Signed-off-by: Jory Pratt <anarchy@g.o> |
| 142 |
---- |
| 143 |
- vendor/openssl-sys/.cargo-checksum.json | 2 +- |
| 144 |
- vendor/openssl-sys/build/main.rs | 34 +++++++++++++------------ |
| 145 |
- 2 files changed, 19 insertions(+), 17 deletions(-) |
| 146 |
- |
| 147 |
-diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json |
| 148 |
-index 8430a26c5..69d8b9a0b 100644 |
| 149 |
---- a/vendor/openssl-sys/.cargo-checksum.json |
| 150 |
-+++ b/vendor/openssl-sys/.cargo-checksum.json |
| 151 |
-@@ -1 +1 @@ |
| 152 |
--{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"cae729f449030ee86fc8e97215a2639c03f87a44d2399c84be8d41c1a6b624f3","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
| 153 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
| 154 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
| 155 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
| 156 |
-\ No newline at end of file |
| 157 |
-+{"files":{"CHANGELOG.md":"a3e7e4750fe6130a93e9423d5b1b68c659dd29246602f71583c7a101c4d647be","Cargo.toml":"5fdba4ce7cf40abec303651694e79a5ae551f040a7bbaad134ed9ab54d26a613","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"61b741c4fe9612f5a70b19bec53d3ab7ec2d7038b163c35b54f0664caa104a31","build/expando.c":"c4fa8a4424b2321f1857edfc5ce1ac1f03eda54440367d3142310c0eb5553004","build/find_normal.rs":"0a2dc417eace7fc72c27b9046ebaf53c75e418b27baa877434925a81fe6c23ed","build/find_vendored.rs":"d88c47f4cf851aa67c0e3dec679910c5c7ba239bc5a1aa89e507a875b4c4ca0f","build/main.rs":"a13d5b9a16af1f75f82ec4be15d2c60d39a3a56bca058aeba1fab35156c9ea38","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"f72d6871d38865d9e7378882135cdc6f1acd66c48a4fc846502b7f488dbbf111","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928 |
| 158 |
f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"95a0803286d1efbe709a3668443b5001f5cce6f9db216165b1e08950972e0bfd","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"7cc334e86d16b3eae165dfa3a6c8e488bc0fe590c17beda38893d2e9d784d5a6","src/dsa.rs":"ae79baf231681900ea76304285b3ffacf5298c90b8c04d371269cf4adbb5b9fa","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"5341787b108f4e9acb12428fbf993aa507e9d77b97284912f7eab414ec6aeff9","src/err.rs":"f6641be5df397086a9db80667e191fb1d92972c29151e617df86672c1a16d3ad","src/evp.rs":"300007bcf00eaff03cb1d113547a79c9495b498ede9e1b2f709a9e6e1ba42ac1","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"e8931dd7e59a56a247823201f52828ec15d0b8dbd15ba297cacd3dcb3ca747cf","src/macros.rs":"638fb9 |
| 159 |
098f6024e82b331eeee50c64cefdb58456dba28ee42560be655a0c2bf6","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"fc7366e75c78707650c8667593ed183eca6a8ce8dd6b911e342f644d1bcf98bd","src/pem.rs":"83bb7745615a99fe2a8d5f8f51addba2024c7e6be847ab6c9244bfd04388c4f9","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"0e8c1f0bc37620a9208175542143bfd411ae88188974d2d5b37a2b8b77d0e2c8","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7 |
| 160 |
d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"18c0c0c5ef02329be90fd279968da61d3e1a6b3a3aec102d6fefd99021d1822a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"60ca3dea1bbfda645bde563b4a878dac129c3f760e3ad572381000fc7a8ef522","src/x509.rs":"20e221731587221aab00aef21b4e4bebb7635603d265d424f3dd3c60d4c511e2","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"30c58ce7d80670cc597d041e0f59862c1100e38743fc9dde2aec6dc811a4a558"},"package":"33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d"} |
| 161 |
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs |
| 162 |
-index 0b8c96dcc..0d9443551 100644 |
| 163 |
---- a/vendor/openssl-sys/build/main.rs |
| 164 |
-+++ b/vendor/openssl-sys/build/main.rs |
| 165 |
-@@ -183,28 +183,30 @@ See rust-openssl README for more information: |
| 166 |
- if let Some(libressl_version) = libressl_version { |
| 167 |
- println!("cargo:libressl_version_number={:x}", libressl_version); |
| 168 |
- |
| 169 |
-+ let major = (libressl_version >> 28) as u8; |
| 170 |
- let minor = (libressl_version >> 20) as u8; |
| 171 |
- let fix = (libressl_version >> 12) as u8; |
| 172 |
-- let (minor, fix) = match (minor, fix) { |
| 173 |
-- (5, 0) => ('5', '0'), |
| 174 |
-- (5, 1) => ('5', '1'), |
| 175 |
-- (5, 2) => ('5', '2'), |
| 176 |
-- (5, _) => ('5', 'x'), |
| 177 |
-- (6, 0) => ('6', '0'), |
| 178 |
-- (6, 1) => ('6', '1'), |
| 179 |
-- (6, 2) => ('6', '2'), |
| 180 |
-- (6, _) => ('6', 'x'), |
| 181 |
-- (7, _) => ('7', 'x'), |
| 182 |
-- (8, 0) => ('8', '0'), |
| 183 |
-- (8, 1) => ('8', '1'), |
| 184 |
-- (8, _) => ('8', 'x'), |
| 185 |
-- (9, 0) => ('9', '0'), |
| 186 |
-- (9, _) => ('9', 'x'), |
| 187 |
-+ let (major, minor, fix) = match (major, minor, fix) { |
| 188 |
-+ (2, 5, 0) => ('2', '5', '0'), |
| 189 |
-+ (2, 5, 1) => ('2', '5', '1'), |
| 190 |
-+ (2, 5, 2) => ('2', '5', '2'), |
| 191 |
-+ (2, 5, _) => ('2', '5', 'x'), |
| 192 |
-+ (2, 6, 0) => ('2', '6', '0'), |
| 193 |
-+ (2, 6, 1) => ('2', '6', '1'), |
| 194 |
-+ (2, 6, 2) => ('2', '6', '2'), |
| 195 |
-+ (2, 6, _) => ('2', '6', 'x'), |
| 196 |
-+ (2, 7, _) => ('2', '7', 'x'), |
| 197 |
-+ (2, 8, 0) => ('2', '8', '0'), |
| 198 |
-+ (2, 8, 1) => ('2', '8', '1'), |
| 199 |
-+ (2, 8, _) => ('2', '8', 'x'), |
| 200 |
-+ (2, 9, 0) => ('2', '9', '0'), |
| 201 |
-+ (2, 9, _) => ('2', '9', 'x'), |
| 202 |
-+ (3, 0, 0) => ('3', '0', '0'), |
| 203 |
- _ => version_error(), |
| 204 |
- }; |
| 205 |
- |
| 206 |
- println!("cargo:libressl=true"); |
| 207 |
-- println!("cargo:libressl_version=2{}{}", minor, fix); |
| 208 |
-+ println!("cargo:libressl_version={}{}{}", major, minor, fix); |
| 209 |
- println!("cargo:version=101"); |
| 210 |
- Version::Libressl |
| 211 |
- } else { |
| 212 |
--- |
| 213 |
-2.22.1 |
| 214 |
|
| 215 |
diff --git a/dev-lang/rust/rust-1.36.0.ebuild b/dev-lang/rust/rust-1.36.0.ebuild |
| 216 |
index bfe22ce8e2b..82dfe0bbb42 100644 |
| 217 |
--- a/dev-lang/rust/rust-1.36.0.ebuild |
| 218 |
+++ b/dev-lang/rust/rust-1.36.0.ebuild |
| 219 |
@@ -92,7 +92,6 @@ PATCHES=( |
| 220 |
"${FILESDIR}"/1.34.2-fix-custom-libdir.patch |
| 221 |
"${FILESDIR}"/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch |
| 222 |
"${FILESDIR}"/1.36.0-libressl.patch |
| 223 |
- "${FILESDIR}"/1.36.0-libressl3.patch |
| 224 |
) |
| 225 |
|
| 226 |
S="${WORKDIR}/${MY_P}-src" |
| 227 |
|
| 228 |
diff --git a/dev-lang/rust/rust-1.37.0.ebuild b/dev-lang/rust/rust-1.37.0.ebuild |
| 229 |
index 695276b1da7..c9bc8c7236f 100644 |
| 230 |
--- a/dev-lang/rust/rust-1.37.0.ebuild |
| 231 |
+++ b/dev-lang/rust/rust-1.37.0.ebuild |
| 232 |
@@ -92,7 +92,6 @@ PATCHES=( |
| 233 |
"${FILESDIR}"/1.34.2-fix-custom-libdir.patch |
| 234 |
"${FILESDIR}"/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch |
| 235 |
"${FILESDIR}"/1.36.0-libressl.patch |
| 236 |
- "${FILESDIR}"/1.36.0-libressl3.patch |
| 237 |
) |
| 238 |
|
| 239 |
S="${WORKDIR}/${MY_P}-src" |
| 240 |
|
| 241 |
diff --git a/dev-lang/rust/rust-1.38.0.ebuild b/dev-lang/rust/rust-1.38.0.ebuild |
| 242 |
index 154fe53800a..306dede9d39 100644 |
| 243 |
--- a/dev-lang/rust/rust-1.38.0.ebuild |
| 244 |
+++ b/dev-lang/rust/rust-1.38.0.ebuild |
| 245 |
@@ -92,7 +92,6 @@ PATCHES=( |
| 246 |
"${FILESDIR}"/1.38.0-fix-custom-libdir.patch |
| 247 |
"${FILESDIR}"/1.38.0-fix-multiple-llvm-rebuilds.patch |
| 248 |
"${FILESDIR}"/1.36.0-libressl.patch |
| 249 |
- "${FILESDIR}"/1.36.0-libressl3.patch |
| 250 |
) |
| 251 |
|
| 252 |
S="${WORKDIR}/${MY_P}-src" |
Archives