rust: updated to 1.93.1

5 files changed, 51 insertions, 38 deletions

diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum
index 60e1c89c..dd4aa57e 100644
--- a/repos/extra/rust/.checksum
+++ b/repos/extra/rust/.checksum
@@ -1,7 +1,7 @@
-f27a10a0eb932c35ed7605a50aac8546706e960b6a7e947d97e96c7f0ac2d0a7  cargo-1.91.0-x86_64-unknown-linux-musl.tar.xz
-a69656d7aba220b002313c7b38fbcfe293d31f911bbfc5287c8f444fc845e06d  fix-curl.patch
-ecefb8300fbbaaeae6ec275c3c5902ff80b78fcd953fa561f9cc27cfe0440264  fix-linux_musl_base.patch
+b7c1c841abe75982e1980c21c58dcb6309e9b67888f61f0d7c05bc5524a7a12a  cargo-1.92.0-x86_64-unknown-linux-musl.tar.xz
+fd87bc0560a065ba264e0d2a99fabe6005abf60155dd2aadc475682852cb4948  fix-curl.patch
+9beea74ff0e15a0c990a79e956125c376e6be3f4a93197dfbef68c93d8923603  fix-linux_musl_base.patch
 29ccf4569b489ce6cbf973384418f5458766eea42907895fe0a55df66e7b9660  libressl.patch
-c72fefa5d203eb2e69e15e82f28da9d31845565b109a9266b5dcd8ee6c16b867  rust-std-1.91.0-x86_64-unknown-linux-musl.tar.xz
-f720fff86c05c3fa5c91a28fbed7aab769203222b2fe52b49bd0dd536f2c0705  rustc-1.91.0-x86_64-unknown-linux-musl.tar.xz
-e4b05839e901f596875a3c26e506a1f9b90620b16bba30154909d0afb4c6b75b  rustc-1.92.0-src.tar.xz
+837424fa7984e38606239fd7dc4c3a01571343f44f0105a90ff051802c9cefdb  rust-std-1.92.0-x86_64-unknown-linux-musl.tar.xz
+ab44428537a5d82cac41c1721f9237dd6587eae592fc14809cfa52f3932b3f2e  rustc-1.92.0-x86_64-unknown-linux-musl.tar.xz
+c8f492b93a95d64efb51fbcc5eab1e8edc1468a3f5be923c756b69d66892161a  rustc-1.93.1-src.tar.xz
diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
index 81ef3ba5..dfc9e5ae 100644
--- a/repos/extra/rust/.files
+++ b/repos/extra/rust/.files
@@ -12,7 +12,7 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/rustc
 -rwxr-xr-x root/root    usr/bin/rustfmt
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/librustc_driver-646ba1ebada05d81.so
+-rw-r--r-- root/root    usr/lib/librustc_driver-20ade5b20b56f631.so
 drwxr-xr-x root/root    usr/lib/rustlib/
 -rw-r--r-- root/root    usr/lib/rustlib/components
 drwxr-xr-x root/root    usr/lib/rustlib/etc/
@@ -33,27 +33,27 @@ drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/
 -rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-objcopy
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-78d9b896c8bd1149.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-60c092587343e2a4.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-88c26e3d8a7351d4.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-4ade0fea14710323.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-a14660542131df28.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-4b89cfcfd5af3d07.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-2bbfffbdaae7bf2d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-03310b218863ba23.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-210055ad1f042e17.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-b96ea454e955e9db.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-9db7fd5e391ee3fa.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-b2399f8774a4fe99.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-a76e0507a6f3aebd.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-229fdc2ccf449e20.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-f73a1f03d33ba030.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-10f59f097f63a425.rlib
--rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-10f59f097f63a425.so
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-e35fe31f30cdbc3e.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-b6c6c28ca38e36cf.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-957e03b0fd5dbde4.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-23891316f564bd92.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-00f3cee614132e08.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-2918403678b66c09.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-8f583c561dc1d8c0.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-0b1498b4c43a6e42.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-d1010445c70df35f.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-dcc856f7a1cdede9.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-4b7f4d9926883c9e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-8da516e3c6e7aa87.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-85d08216fd39d9ad.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-2209ad20996add97.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-3fe2be35b4ffd660.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-d6b890f73dc3f7c0.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-cf49eb75e6deb3f7.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-363ef57f1d555d1c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-9126af8ebece9890.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-efa58e996748225a.rlib
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-efa58e996748225a.so
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-638fb040956e1dd4.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-79069d4e892416a2.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-de3054a2c7e11405.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-d4af69c6095bb520.rlib
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/Scrt1.o
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
index 96dc46a6..f4f92a4e 100644
--- a/repos/extra/rust/abuild
+++ b/repos/extra/rust/abuild
@@ -1,9 +1,9 @@
 name=rust
-version=1.92.0
+version=1.93.1
 
 ##cat src/stage0.txt
-export _date=2025-10-30
-export _rustc=1.91.0
+export _date=2025-12-11
+export _rustc=1.92.0
 export _cargo=$_rustc
 ##
 
@@ -35,9 +35,9 @@ build() {
 	cp $SRC/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
 	cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
 	
-	#sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.79+curl-8.12.0/.cargo-checksum.json
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.83+curl-8.15.0/.cargo-checksum.json
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.84+curl-8.17.0/.cargo-checksum.json
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.109/.cargo-checksum.json
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.107/.cargo-checksum.json
 	sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.92/.cargo-checksum.json
diff --git a/repos/extra/rust/fix-curl.patch b/repos/extra/rust/fix-curl.patch
index 2f330e73..9d25f092 100644
--- a/repos/extra/rust/fix-curl.patch
+++ b/repos/extra/rust/fix-curl.patch
@@ -24,3 +24,16 @@ index 433a6c5..1bb712f 100644
          .define("CURL_DISABLE_DICT", None)
          .define("CURL_DISABLE_GOPHER", None)
          .define("CURL_DISABLE_IMAP", None)
+diff --git a/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs b/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs
+index b74c085..f347449 100644
+--- a/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs
++++ b/vendor/curl-sys-0.4.84+curl-8.17.0/build.rs
+@@ -106,6 +106,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/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch
index 8671a3f0..da4377f8 100644
--- a/repos/extra/rust/fix-linux_musl_base.patch
+++ b/repos/extra/rust/fix-linux_musl_base.patch
@@ -1,14 +1,14 @@
 diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
-index 1bef602..f81dbfa 100644
+index 6d3124b..a9cf0f9 100644
 --- a/compiler/rustc_target/src/spec/base/linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
 @@ -1,11 +1,8 @@
--use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects};
-+use crate::spec::{base, TargetOptions};
+-use crate::spec::{Env, LinkSelfContainedDefault, TargetOptions, base, crt_objects};
++use crate::spec::{base, Env, TargetOptions};
  
  pub(crate) fn opts() -> TargetOptions {
      TargetOptions {
-         env: "musl".into(),
+         env: Env::Musl,
 -        pre_link_objects_self_contained: crt_objects::pre_musl_self_contained(),
 -        post_link_objects_self_contained: crt_objects::post_musl_self_contained(),
 -        link_self_contained: LinkSelfContainedDefault::InferredForMusl,
@@ -16,7 +16,7 @@ index 1bef602..f81dbfa 100644
      }
  }
 diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
-index e3b6430..13a96e2 100644
+index 2d84e78..0e6cb0f 100644
 --- a/compiler/rustc_target/src/spec/crt_objects.rs
 +++ b/compiler/rustc_target/src/spec/crt_objects.rs
 @@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
@@ -47,7 +47,7 @@ index e3b6430..13a96e2 100644
 -
  pub(super) fn pre_mingw_self_contained() -> CrtObjects {
      new(&[
-         (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
+         (LinkOutputKind::DynamicNoPicExe, &["crt2.o"]),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs
 index 8dcdc5b..25f53d6 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs