From e96e528d54f675f157cd0a99922842d6035aee3e Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Thu, 3 Nov 2022 13:02:34 -0500
Subject: [PATCH] rust: 1.65.0

---
 extra/rust/build     | 8 ++++++--
 extra/rust/checksums | 8 ++++----
 extra/rust/sources   | 6 +++---
 extra/rust/version   | 2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/extra/rust/build b/extra/rust/build
index 5892e776..d97dfd26 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -39,14 +39,18 @@ profiler       = false
 full-bootstrap = false
 EOF
 
+# If possible, use system rust to bootstrap.
 maj="${2%%.*}"
 min="${2%.*}"
 min="${min#*.}"
 
+# Fall back to vendor binaries if rustc, et al are not present, or if one of
+# them suffered ABI breakage.
 rust_version=$(rustc --version 2>/dev/null) || rust_version=null
+cargo --version 2>/dev/null || rust_version=null
+rustfmt --version 2>/dev/null || rust_version=null
 rust_version="${rust_version#rustc }"
 
-# If possible, use system rust to bootstrap.
 case "$rust_version" in
     "$maj.$min".*|"$maj.$((min - 1))".*)
         cat >> config.toml <<EOF
@@ -60,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/2022-08-11}"
+        mkdir -p "${cache_dir:=build/cache/2022-09-22}"
 
         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 8165eeb3..bbe6ba21 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,5 +1,5 @@
-e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac
-6fcfa4f9a51d35bf2c5c92ac15c688baa8c98d9fded05ab6abfdae85cb5aed8c
-b6566a9b1dafe03cf4a01b58b2db0e14a0044ae5773736827882bd549108277e
-6f6ce044832a2433c250f4f27a61f69081e2b0f7e4e1f141492c2ce99ee8511e
+2d6aa2ea3fedd55acbbd65f78349385f9daa9c14e25db7a8df5d015588eee1cf
+29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb
+5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
+01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807
 2be91d7548e55476a4e62aca25dae606a06a36ef30b51af4da5bec4da400c3b0
diff --git a/extra/rust/sources b/extra/rust/sources
index 4c676c51..ce89bc27 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,5 +1,5 @@
 https://static.rust-lang.org/dist/rustc-VERSION-src.tar.xz
-https://static.rust-lang.org/dist/2022-08-11/rust-std-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2022-08-11/rustc-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract
-https://static.rust-lang.org/dist/2022-08-11/cargo-1.63.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2022-09-22/rust-std-1.64.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2022-09-22/rustc-1.64.0-x86_64-unknown-linux-musl.tar.xz?no-extract
+https://static.rust-lang.org/dist/2022-09-22/cargo-1.64.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 e27de5c0..dc79a149 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.64.0 1
+1.65.0 1