From ca2694516b1dafe123fe946f911cc56b91bb9d52 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Tue, 18 Jun 2024 01:43:16 -0500
Subject: [PATCH] rust: 1.79.0

---
 extra/rust/build                  |  7 ++++---
 extra/rust/checksums              | 10 +++++-----
 extra/rust/patches/fix-curl.patch |  6 ++----
 extra/rust/sources                |  8 ++++----
 extra/rust/version                |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/extra/rust/build b/extra/rust/build
index 942ed0d4..60d150c7 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -13,8 +13,9 @@ sed 's/\(crt_static_default = \)true/\1false/' \
     compiler/rustc_target/src/spec/base/linux_musl.rs > _
 mv -f _ compiler/rustc_target/src/spec/base/linux_musl.rs
 
-sed 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json > _
-mv -f _ vendor/curl-sys/.cargo-checksum.json
+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
 
 cat > config.toml <<EOF
 [llvm]
@@ -63,7 +64,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-03-21}"
+        mkdir -p "${cache_dir:=build/cache/2024-05-02}"
 
         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 aa2805a8..2d72c002 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-f99458912a0430a60e6d25225e4f76dd1b3c5e5e4817ea75ef1f5f9bfc72bcdb06
-79cf82127edade36b0589ff533f6432f9b2bc3c006ce5f5963ada88e73a72ab075
-22104f56d714d35155b387822ae68666654e53bd0e668035857ec5c60827d5cfad
-05f5a45c670f479de57a0664842302ecfef3c532e016cd917a5937523be2c8a026
-97086f892efe0679b6429e507aa65138ff21d1c776f583e593f5c1911e83bf1e7a
+638321b2d1c4f5d4e9b5e46356dbbdfef6d486429d5379e47246b0bbb779525f34
+3da37fdb8c2f920400fea76dd459b85c974b09dbd849ff3aabb4e68b463d3f2ab8
+354d30b8601ea000332c7d6dff6fe9bb8be874c69b2c418b380923eab82d2aa857
+b3c10014216c8adeccbf390e76066e78a68c86e956510413dc6ee3a02b96be7942
+82ccf7117a29f55ef4ef81ace378e576ac31270036b93e917e500428117beb72e7
diff --git a/extra/rust/patches/fix-curl.patch b/extra/rust/patches/fix-curl.patch
index 3e9e182f..3ca48008 100644
--- a/extra/rust/patches/fix-curl.patch
+++ b/extra/rust/patches/fix-curl.patch
@@ -1,7 +1,5 @@
-diff --git a/vendor/curl-sys/build.rs b/vendor/curl-sys/build.rs
-index 24475cc..3249440 100644
---- a/vendor/curl-sys/build.rs
-+++ b/vendor/curl-sys/build.rs
+--- 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
 @@ -111,6 +111,8 @@ fn main() {
          .include("curl/lib")
          .include("curl/include")
diff --git a/extra/rust/sources b/extra/rust/sources
index eb6dafe4..22dd26ee 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
-https://static.rust-lang.org/dist/rustc-1.78.0-src.tar.xz
-https://static.rust-lang.org/dist/2024-03-21/rust-std-1.77.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2024-03-21/rustc-1.77.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2024-03-21/cargo-1.77.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/rustc-1.79.0-src.tar.xz
+https://static.rust-lang.org/dist/2024-05-02/rust-std-1.78.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2024-05-02/rustc-1.78.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2024-05-02/cargo-1.78.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 8b9cb920..f4d90d90 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.78.0 1
+1.79.0 1