From da3916cd96344a0ae4334cf707b8f7231f72f724 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 2 Jun 2020 23:04:36 +0300 Subject: [PATCH] rust: Fix build with libressl 3.2.X --- extra/rust/checksums | 2 +- extra/rust/patches/libressl-3.1.X.patch | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/extra/rust/checksums b/extra/rust/checksums index a58e15db..69641d56 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -4,4 +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 +903880513dc61427bfedcd99c9b8a4b8156952b9cc5c486e29e5d5a2a77b484a 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 index 737e5b02..c382cfb9 100644 --- a/extra/rust/patches/libressl-3.1.X.patch +++ b/extra/rust/patches/libressl-3.1.X.patch @@ -2,13 +2,16 @@ 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: +@@ -204,6 +204,12 @@ 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'), ++ (3, 2, 0) => ('3', '2', '0'), ++ (3, 2, 1) => ('3', '2', '0'), ++ (3, 2, _) => ('3', '2', 'x'), _ => version_error(), }; - +