From 4ea5d15c4da3836ac8a9c3a128ca311190adbdf7 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Fri, 18 Oct 2024 12:00:54 -0500
Subject: [PATCH] rust: 1.82.0

---
 extra/rust/build                  | 10 +++++++---
 extra/rust/checksums              | 10 +++++-----
 extra/rust/patches/fix-curl.patch | 19 +++++++++++++++++--
 extra/rust/sources                |  8 ++++----
 extra/rust/version                |  2 +-
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/extra/rust/build b/extra/rust/build
index d0e9ba5b..6936b70d 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -14,8 +14,12 @@ sed 's/\(crt_static_default = \)true/\1false/' \
 mv -f _ compiler/rustc_target/src/spec/base/linux_musl.rs
 
 sed 's/\("files":{\)[^}]*/\1/' \
-    vendor/curl-sys-0.4.72+curl-8.6.0/.cargo-checksum.json > _
-mv -f _ vendor/curl-sys-0.4.72+curl-8.6.0/.cargo-checksum.json
+    vendor/curl-sys-0.4.52+curl-7.81.0/.cargo-checksum.json > _
+mv -f _ vendor/curl-sys-0.4.52+curl-7.81.0/.cargo-checksum.json
+
+sed 's/\("files":{\)[^}]*/\1/' \
+    vendor/curl-sys-0.4.74+curl-8.9.0/.cargo-checksum.json > _
+mv -f _ vendor/curl-sys-0.4.74+curl-8.9.0/.cargo-checksum.json
 
 cat > config.toml <<EOF
 [llvm]
@@ -64,7 +68,7 @@ EOF
         # This mimics the download process of rust's 'x.py'
         # bootstrap library to allow for the removal of the internet
         # connection requirement per build.
-        mkdir -p "${cache_dir:=build/cache/2024-08-08}"
+        mkdir -p "${cache_dir:=build/cache/2024-09-05}"
 
         for tarball in *.tar.xz\?no-extract; do
             mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
diff --git a/extra/rust/checksums b/extra/rust/checksums
index 1af649f6..9610bbbc 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-5119ad701c5ec6b635dda222e474675398be55d63b691a01fbe188b9e915a99cb1
-56d0146af011d4d15d09e80d64b17c798b7f3610916577cea4145eb188620a1b52
-c8ab95494c2689cb44c35d18aff2cf5e8b65a888154eec17644da5ba2030e569b0
-35df610d37dbb146c3cb0ac7b523eec203b213335ee1b2d3c2cc3302c09650acfd
-82ccf7117a29f55ef4ef81ace378e576ac31270036b93e917e500428117beb72e7
+42ffc0235c648e5559c4e99029aaeee1ba7d76392c27594bf1c3cc9570c8a50f4d
+bfe3cbea8ad275258a7a9d0bd46f9dc7a6d8adbaabe6257507e47c1dd4c129a52e
+c5bc0fed9d73f8f5e3fddc7d0366b067e7c3ffce0df5ceb8c80d77537b929e9e86
+ea13ff0a3533fc726daf004852371bff500ef1464617078ef04a0d63302532bf50
+c03ac16dbb7aecb143e7cd701feb480862af63dbb044e0f0637eaff93758937fca
diff --git a/extra/rust/patches/fix-curl.patch b/extra/rust/patches/fix-curl.patch
index 3ca48008..e0469d8d 100644
--- a/extra/rust/patches/fix-curl.patch
+++ b/extra/rust/patches/fix-curl.patch
@@ -1,5 +1,7 @@
---- a/vendor/curl-sys-0.4.72+curl-8.6.0/build.rs
-+++ b/vendor/curl-sys-0.4.72+curl-8.6.0/build.rs
+diff --git a/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs b/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs
+index e9a2a42..560bfed 100644
+--- a/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs
++++ b/vendor/curl-sys-0.4.52+curl-7.81.0/build.rs
 @@ -111,6 +111,8 @@ fn main() {
          .include("curl/lib")
          .include("curl/include")
@@ -9,3 +11,16 @@
          .define("CURL_DISABLE_DICT", None)
          .define("CURL_DISABLE_GOPHER", None)
          .define("CURL_DISABLE_IMAP", None)
+diff --git a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
+index 7d9a661..683354e 100644
+--- a/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
++++ b/vendor/curl-sys-0.4.74+curl-8.9.0/build.rs
+@@ -109,6 +109,8 @@ fn main() {
+         .include("curl/lib")
+         .include("curl/include")
+         .define("BUILDING_LIBCURL", None)
++        .define("CURL_CA_BUNDLE", "\"/etc/ssl/cert.pem\"")
++        .define("CURL_CA_PATH", "\"/etc/ssl/certs\"")
+         .define("CURL_DISABLE_DICT", None)
+         .define("CURL_DISABLE_GOPHER", None)
+         .define("CURL_DISABLE_IMAP", None)
diff --git a/extra/rust/sources b/extra/rust/sources
index d0c67a0e..2c9a3edb 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.81.0-src.tar.xz
-https://static.rust-lang.org/dist/2024-08-08/rust-std-1.80.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2024-08-08/rustc-1.80.1-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2024-08-08/cargo-1.80.1-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.82.0-src.tar.xz
+https://static.rust-lang.org/dist/2024-09-05/rust-std-1.81.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2024-09-05/rustc-1.81.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-x86_64-unknown-linux-musl.tar.xz?no-extract
 patches/fix-curl.patch
diff --git a/extra/rust/version b/extra/rust/version
index 5a4ffcf0..4dd8a779 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.81.0 1
+1.82.0 1