rust: Update for libressl 3.1.1

2020-05-17 17:44:03 +03:00 · 2020-05-17 17:44:03 +03:00 · 22a3500c82
commit 22a3500c82
parent bd104356cb
4 changed files with 17 additions and 1 deletions
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@ -4,3 +4,4 @@ f429e81c3266bdcc038b6c2c2e5f51c64f75a85b46749e2cf5b93556f17b63a1  rust-std-1.42.
 705e648c727c50b3815a7be4a18a5886cb9f68e69df990710e938678080264a0  cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f  musl.patch
 722f672f3a96ad1916d47a88b922579456b3af2cdc37096ce98a093f3589a4fb  llvm10.patch
+a42474d34b4022e6b6cb066e1f23a1f41d7d69c4196407a8185926060d32e796  libressl-3.1.X.patch
--- a/extra/rust/patches/libressl-3.1.X.patch
+++ b/extra/rust/patches/libressl-3.1.X.patch
@ -0,0 +1,14 @@
+diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
+index 162e11a66..9f3544313 100644
+--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
+@@ -204,6 +204,9 @@ See rust-openssl README for more information:
+             (3, 0, 0) => ('3', '0', '0'),
+             (3, 0, 1) => ('3', '0', '1'),
+             (3, 0, _) => ('3', '0', 'x'),
+            (3, 1, 0) => ('3', '1', '0'),
+            (3, 1, 1) => ('3', '1', '0'),
+            (3, 1, _) => ('3', '1', 'x'),
+             _ => version_error(),
+         };
+ 
--- a/extra/rust/sources
+++ b/extra/rust/sources
@ -4,3 +4,4 @@ https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-m
 https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/musl.patch
 patches/llvm10.patch
+patches/libressl-3.1.X.patch
--- a/extra/rust/version
+++ b/extra/rust/version
@ -1 +1 @@
-1.43.1 1
+1.43.1 2
 @ -1 +1 @@
 .43.1 1
 .43.1 2