From 22a3500c829b0d7cc8b75b66d2028686fc8413da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 17 May 2020 17:44:03 +0300 Subject: [PATCH] rust: Update for libressl 3.1.1 --- extra/rust/checksums | 1 + extra/rust/patches/libressl-3.1.X.patch | 14 ++++++++++++++ extra/rust/sources | 1 + extra/rust/version | 2 +- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 extra/rust/patches/libressl-3.1.X.patch diff --git a/extra/rust/checksums b/extra/rust/checksums index f1a61846..a58e15db 100644 --- 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 diff --git a/extra/rust/patches/libressl-3.1.X.patch b/extra/rust/patches/libressl-3.1.X.patch new file mode 100644 index 00000000..737e5b02 --- /dev/null +++ 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(), + }; + diff --git a/extra/rust/sources b/extra/rust/sources index 3cc8a2fd..a47400bf 100644 --- 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 diff --git a/extra/rust/version b/extra/rust/version index 5e57c169..6e671cf6 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.43.1 1 +1.43.1 2