commit 2e064537419ba223d15cb0193eef0bb7fe5e6f6c
parent 4edb7f3f4cfcc03bf6eb0a72c714dd68edad7676
Author: emmett1 <emmett1.2miligrams@protonmail.com>
Date: Tue, 21 Oct 2025 08:44:43 +0000
rust: updated to 1.90.0
Diffstat:
5 files changed, 71 insertions(+), 73 deletions(-)
diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum
@@ -1,7 +1,7 @@
-cbf3750aed42e86d34b291ba5884361140dfe0c716a6610aac35964265618dc9 cargo-1.88.0-x86_64-unknown-linux-musl.tar.xz
-c3e4bbb5ddd2268c19896a9411f471e0a2d835b2abea54d6f93c434af3d85c7d fix-curl.patch
+2a0da7ecde9c4a1076bebdfa204cdd0f30fbced2cdab2b7622b934f79bba6b12 cargo-1.89.0-x86_64-unknown-linux-musl.tar.xz
+721892425840a5860b73d40ab3897fd86619091937f7cf7c055e411971546d49 fix-curl.patch
ecefb8300fbbaaeae6ec275c3c5902ff80b78fcd953fa561f9cc27cfe0440264 fix-linux_musl_base.patch
-395ee1e263ea4c887fd038e164f1e94881ecdc39cb1c475b9b790740e8fd7988 libressl.patch
-dc5c9cb00481b39f902cbaad00df1f856d30fc91485ba987ba50a87957d20fee rust-std-1.88.0-x86_64-unknown-linux-musl.tar.xz
-19874c904c8c6f1f06e55d5ec16414d150a4df750d2cbb1f7d1d160a89681738 rustc-1.88.0-x86_64-unknown-linux-musl.tar.xz
-5170cf6e21c61ff965be6298248c360c3c03ac59c7de9326862fba482f6089a5 rustc-1.89.0-src.tar.xz
+29ccf4569b489ce6cbf973384418f5458766eea42907895fe0a55df66e7b9660 libressl.patch
+89ff402b00160f5e6a8670c332cfba0fe6ccd0df2fef2b615f55b36bfda15f69 rust-std-1.89.0-x86_64-unknown-linux-musl.tar.xz
+fb338f71db03a8734bcb18a87fa282a513bcbb65c918042f4954ade25772a8c4 rustc-1.89.0-x86_64-unknown-linux-musl.tar.xz
+b231648ca4d910cea49b62c7c323ce8a42eb1ceba07f2178f286ef65b72e6432 rustc-1.90.0-src.tar.xz
diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
@@ -11,7 +11,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-d8f6ccbad630bb74.so
+-rw-r--r-- root/root usr/lib/librustc_driver-94bc0e786bd230a3.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/
@@ -32,28 +32,28 @@ 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-b914915601a540ee.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-9549865b96027a53.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-2c9e412489fe77e8.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-fb112958ae32107a.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-f356c884c023441d.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-2723deecd228d8df.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-3252756acea03d4d.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-74ac1df5f94b4192.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-3df01eb20e7d08fb.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-1b1d05cc1504df78.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b7696707417340ba.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-b94ce4cabb72203d.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-34bbd448057032c7.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-f9d22cadcd097152.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-38a3164a52d96121.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cc9978ea61e52c7b.rlib
--rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cc9978ea61e52c7b.so
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-9df3655dbcfd32d3.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-90104f90a4fd9767.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-bb3e040b684feb5b.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-b1fceef505818c70.rlib
--rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-774100fc58440514.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-9f10ce3475f0e66d.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-ffce10354d3d36e9.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-e72fdb2008cba580.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-e3b406b2e0e78946.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-b6af6c9568b446a0.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-562a813a4736c810.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-52a672328bb7b472.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-c9bad2df40ce7abf.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-d752da1466c32d0e.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-dbcba164215bc33b.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-6d2c710a53ccab06.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_literal_escaper-26105ef0af92df6f.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-c905f6ef16600523.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-2e2ff6035abcf258.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-25e60f999205a58f.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-c3fd1b95bd4e7472.rlib
+-rwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-c3fd1b95bd4e7472.so
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-b40f1dfe7647185c.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-d4e60bce74d37c3d.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-96d5d665864995d6.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-43f89b7a8a79c9cf.rlib
+-rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-e93cbc6fb142c974.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
@@ -1,9 +1,9 @@
name=rust
-version=1.89.0
+version=1.90.0
##cat src/stage0.txt
-export _date=2025-06-26
-export _rustc=1.88.0
+export _date=2025-08-07
+export _rustc=1.89.0
export _cargo=$_rustc
##
@@ -29,9 +29,8 @@ build() {
#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.80+curl-8.12.1/.cargo-checksum.json
sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys-0.4.82+curl-8.14.1/.cargo-checksum.json
- sed -i 's/\("files":{\)[^}]*/\1/' vendor/openssl-sys-0.9.104/.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
@@ -11,19 +11,6 @@ index 8315a20..98dedb4 100644
.define("CURL_DISABLE_DICT", None)
.define("CURL_DISABLE_GOPHER", None)
.define("CURL_DISABLE_IMAP", None)
-diff --git a/vendor/curl-sys-0.4.80+curl-8.12.1/build.rs b/vendor/curl-sys-0.4.80+curl-8.12.1/build.rs
-index 89f431d..57f891a 100644
---- a/vendor/curl-sys-0.4.80+curl-8.12.1/build.rs
-+++ b/vendor/curl-sys-0.4.80+curl-8.12.1/build.rs
-@@ -117,6 +117,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/vendor/curl-sys-0.4.82+curl-8.14.1/build.rs b/vendor/curl-sys-0.4.82+curl-8.14.1/build.rs
index db930c3..afff718 100644
--- a/vendor/curl-sys-0.4.82+curl-8.14.1/build.rs
diff --git a/repos/extra/rust/libressl.patch b/repos/extra/rust/libressl.patch
@@ -1,60 +1,70 @@
-diff --git a/vendor/openssl-sys-0.9.104/build/main.rs b/vendor/openssl-sys-0.9.104/build/main.rs
-index f379e1e6..0429f12a 100644
---- a/vendor/openssl-sys-0.9.104/build/main.rs
-+++ b/vendor/openssl-sys-0.9.104/build/main.rs
-@@ -103,6 +103,7 @@ fn main() {
- println!("cargo:rustc-check-cfg=cfg(libressl382)");
+diff --git a/vendor/openssl-sys-0.9.107/build/main.rs b/vendor/openssl-sys-0.9.107/build/main.rs
+index c4ac240e..906958e3 100644
+--- a/vendor/openssl-sys-0.9.107/build/main.rs
++++ b/vendor/openssl-sys-0.9.107/build/main.rs
+@@ -151,6 +151,7 @@ fn main() {
println!("cargo:rustc-check-cfg=cfg(libressl390)");
println!("cargo:rustc-check-cfg=cfg(libressl400)");
-+ println!("cargo:rustc-check-cfg=cfg(libressl410)");
+ println!("cargo:rustc-check-cfg=cfg(libressl410)");
++ println!("cargo:rustc-check-cfg=cfg(libressl420)");
println!("cargo:rustc-check-cfg=cfg(ossl101)");
println!("cargo:rustc-check-cfg=cfg(ossl102)");
-@@ -382,6 +383,8 @@ See rust-openssl documentation for more information:
+@@ -449,6 +450,10 @@ See rust-openssl documentation for more information:
(3, 9, _) => ('3', '9', 'x'),
(4, 0, 0) => ('4', '0', '0'),
(4, 0, _) => ('4', '0', 'x'),
+ (4, 1, 0) => ('4', '1', '0'),
+ (4, 1, _) => ('4', '1', 'x'),
++ (4, 2, 0) => ('4', '2', '0'),
++ (4, 2, _) => ('4', '2', 'x'),
_ => version_error(),
};
-@@ -424,7 +427,7 @@ fn version_error() -> ! {
+@@ -491,7 +496,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5
-through 4.0.x, but a different version of OpenSSL was found. The build is now aborting
-+through 4.1.x, but a different version of OpenSSL was found. The build is now aborting
++through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"
-diff --git a/vendor/openssl-sys-0.9.107/build/main.rs b/vendor/openssl-sys-0.9.107/build/main.rs
-index c4ac240e..4007a265 100644
---- a/vendor/openssl-sys-0.9.107/build/main.rs
-+++ b/vendor/openssl-sys-0.9.107/build/main.rs
-@@ -449,6 +449,8 @@ See rust-openssl documentation for more information:
- (3, 9, _) => ('3', '9', 'x'),
- (4, 0, 0) => ('4', '0', '0'),
+diff --git a/vendor/openssl-sys-0.9.109/build/main.rs b/vendor/openssl-sys-0.9.109/build/main.rs
+index 4007a265..906958e3 100644
+--- a/vendor/openssl-sys-0.9.109/build/main.rs
++++ b/vendor/openssl-sys-0.9.109/build/main.rs
+@@ -151,6 +151,7 @@ fn main() {
+ println!("cargo:rustc-check-cfg=cfg(libressl390)");
+ println!("cargo:rustc-check-cfg=cfg(libressl400)");
+ println!("cargo:rustc-check-cfg=cfg(libressl410)");
++ println!("cargo:rustc-check-cfg=cfg(libressl420)");
+
+ println!("cargo:rustc-check-cfg=cfg(ossl101)");
+ println!("cargo:rustc-check-cfg=cfg(ossl102)");
+@@ -451,6 +452,8 @@ See rust-openssl documentation for more information:
(4, 0, _) => ('4', '0', 'x'),
-+ (4, 1, 0) => ('4', '1', '0'),
-+ (4, 1, _) => ('4', '1', 'x'),
+ (4, 1, 0) => ('4', '1', '0'),
+ (4, 1, _) => ('4', '1', 'x'),
++ (4, 2, 0) => ('4', '2', '0'),
++ (4, 2, _) => ('4', '2', 'x'),
_ => version_error(),
};
-@@ -491,7 +493,7 @@ fn version_error() -> ! {
+@@ -493,7 +496,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3), or LibreSSL 2.5
--through 4.0.x, but a different version of OpenSSL was found. The build is now aborting
-+through 4.1.x, but a different version of OpenSSL was found. The build is now aborting
+-through 4.1.x, but a different version of OpenSSL was found. The build is now aborting
++through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"
diff --git a/vendor/openssl-sys-0.9.92/build/main.rs b/vendor/openssl-sys-0.9.92/build/main.rs
-index 21ccf3d0..2b06ee0f 100644
+index 21ccf3d0..3bd07b5f 100644
--- a/vendor/openssl-sys-0.9.92/build/main.rs
+++ b/vendor/openssl-sys-0.9.92/build/main.rs
-@@ -273,6 +273,14 @@ See rust-openssl documentation for more information:
+@@ -273,6 +273,16 @@ See rust-openssl documentation for more information:
(3, 7, 1) => ('3', '7', '1'),
(3, 7, _) => ('3', '7', 'x'),
(3, 8, 0) => ('3', '8', '0'),
@@ -66,15 +76,17 @@ index 21ccf3d0..2b06ee0f 100644
+ (4, 0, _) => ('4', '0', 'x'),
+ (4, 1, 0) => ('4', '1', '0'),
+ (4, 1, _) => ('4', '1', 'x'),
++ (4, 2, 0) => ('4', '2', '0'),
++ (4, 2, _) => ('4', '2', 'x'),
_ => version_error(),
};
-@@ -315,7 +323,7 @@ fn version_error() -> ! {
+@@ -315,7 +325,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5
-through 3.8.0, but a different version of OpenSSL was found. The build is now aborting
-+through 4.1.x, but a different version of OpenSSL was found. The build is now aborting
++through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"
