From 40b7b544a3194967cf95af95597f8ce76d59ee43 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 8 Jul 2021 00:02:10 +0300
Subject: [PATCH] rust: depend on openssl

---
 extra/rust/build                  | 12 +++---------
 extra/rust/depends                |  2 +-
 extra/rust/patches/libressl.patch | 13 -------------
 extra/rust/sources                |  1 -
 4 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 extra/rust/patches/libressl.patch

diff --git a/extra/rust/build b/extra/rust/build
index d27cbe82..063aee5f 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-patch -p1 < libressl.patch
-
 # This package mimics the download process of rust's 'x.py'
 # bootstrap library to allow for the removal of the internet
 # connection requirement per build.
@@ -23,13 +21,9 @@ do
 done
 
 # Ignore checksums of files modified above.
-for f in \
-    vendor/openssl-sys/.cargo-checksum.json \
-    vendor/rustc-ap-rustc_target/.cargo-checksum.json
-do
-    sed 's/\("files":{\)[^}]*/\1/' "$f" > _
-    mv -f _ "$f"
-done
+sed 's/\("files":{\)[^}]*/\1/' \
+    vendor/rustc-ap-rustc_target/.cargo-checksum.json > _
+mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json
 
 cat > config.toml <<EOF
 [llvm]
diff --git a/extra/rust/depends b/extra/rust/depends
index d7d2fe0f..e482f17e 100644
--- a/extra/rust/depends
+++ b/extra/rust/depends
@@ -1,6 +1,6 @@
 cmake   make
 curl    make
-libressl
+openssl
 llvm
 pkgconf make
 python  make
diff --git a/extra/rust/patches/libressl.patch b/extra/rust/patches/libressl.patch
deleted file mode 100644
index be633ba4..00000000
--- a/extra/rust/patches/libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
-index 49f26d2b7..27deb1f36 100644
---- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -221,6 +221,8 @@ See rust-openssl README for more information:
-             (3, 1, 0) => ('3', '1', '0'),
-             (3, 1, _) => ('3', '1', 'x'),
-             (3, 2, 0) => ('3', '2', '0'),
-+            (3, 2, 1) => ('3', '2', '1'),
-+            (3, 3, _) => ('3', '3', 'x'),
-             _ => version_error(),
-         };
-
diff --git a/extra/rust/sources b/extra/rust/sources
index 74a699d1..cea27b13 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -2,4 +2,3 @@ https://static.rust-lang.org/dist/rustc-1.53.0-src.tar.xz
 https://static.rust-lang.org/dist/2021-05-06/rust-std-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 https://static.rust-lang.org/dist/2021-05-06/rustc-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 https://static.rust-lang.org/dist/2021-05-06/cargo-1.52.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-patches/libressl.patch