rust: depend on openssl

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 \
+sed 's/\("files":{\)[^}]*/\1/' \
-    vendor/openssl-sys/.cargo-checksum.json \
+    vendor/rustc-ap-rustc_target/.cargo-checksum.json > _
-    vendor/rustc-ap-rustc_target/.cargo-checksum.json
+mv -f _ vendor/rustc-ap-rustc_target/.cargo-checksum.json
-do
-    sed 's/\("files":{\)[^}]*/\1/' "$f" > _
-    mv -f _ "$f"
-done
 
 cat > config.toml <<EOF
 [llvm]

extra/rust/depends

@@ -1,6 +1,6 @@
 cmake   make
 curl    make
-libressl
+openssl
 llvm
 pkgconf make
 python  make

extra/rust/patches/libressl.patch

@@ -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(),
-         };
-

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