From 0f2e5b9b91a47dda4309ff6b5441e520e481500f Mon Sep 17 00:00:00 2001 From: jchzhou Date: Fri, 26 Sep 2025 11:02:39 +0800 Subject: [PATCH] Upgrade to 1.90.0 --- ...st-1.90.0-aarch64-unknown-linux-gnu.tar.xz | 4 ++-- ....90.0-loongarch64-unknown-linux-gnu.tar.xz | 4 ++-- ...-1.90.0-riscv64gc-unknown-linux-gnu.tar.xz | 4 ++-- ...ust-1.90.0-x86_64-unknown-linux-gnu.tar.xz | 4 ++-- rust.spec | 21 +++++++++------- rustc-1.89.0-src.tar.xz | 3 --- rustc-1.89.0-src.tar.xz.asc | 16 ------------- ...atch => rustc-1.90.0-disable-libssh2.patch | 24 +++++++++---------- rustc-1.90.0-src.tar.xz | 3 +++ rustc-1.90.0-src.tar.xz.asc | 16 +++++++++++++ 10 files changed, 51 insertions(+), 48 deletions(-) rename rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz => rust-1.90.0-aarch64-unknown-linux-gnu.tar.xz (32%) rename rust-1.88.0-loongarch64-unknown-linux-gnu.tar.xz => rust-1.90.0-loongarch64-unknown-linux-gnu.tar.xz (32%) rename rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz => rust-1.90.0-riscv64gc-unknown-linux-gnu.tar.xz (32%) rename rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz => rust-1.90.0-x86_64-unknown-linux-gnu.tar.xz (32%) delete mode 100644 rustc-1.89.0-src.tar.xz delete mode 100644 rustc-1.89.0-src.tar.xz.asc rename rustc-1.88.0-disable-libssh2.patch => rustc-1.90.0-disable-libssh2.patch (52%) create mode 100644 rustc-1.90.0-src.tar.xz create mode 100644 rustc-1.90.0-src.tar.xz.asc diff --git a/rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz b/rust-1.90.0-aarch64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz rename to rust-1.90.0-aarch64-unknown-linux-gnu.tar.xz index ba45e2c..174c80e 100644 --- a/rust-1.88.0-aarch64-unknown-linux-gnu.tar.xz +++ b/rust-1.90.0-aarch64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5decc46123eb888f809f2ee3b118d13586a37ffad38afaefe56aa7139481d34 -size 165627944 +oid sha256:59f1883fcdd2d7243d2fd1ed19f22e05219251227abacfa3d656aebfbcc5e838 +size 169265824 diff --git a/rust-1.88.0-loongarch64-unknown-linux-gnu.tar.xz b/rust-1.90.0-loongarch64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.88.0-loongarch64-unknown-linux-gnu.tar.xz rename to rust-1.90.0-loongarch64-unknown-linux-gnu.tar.xz index c2eef25..de0f16a 100644 --- a/rust-1.88.0-loongarch64-unknown-linux-gnu.tar.xz +++ b/rust-1.90.0-loongarch64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:351293deeac73e30c3d67db28a4894642d132e934aeeda44eedf8df036a88c97 -size 261520268 +oid sha256:405a53cb03f1958a7bafac4c983293bf3b03139f34370119eb7b07c1ad47adbc +size 262294868 diff --git a/rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz b/rust-1.90.0-riscv64gc-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz rename to rust-1.90.0-riscv64gc-unknown-linux-gnu.tar.xz index 2227c3c..44a295f 100644 --- a/rust-1.88.0-riscv64gc-unknown-linux-gnu.tar.xz +++ b/rust-1.90.0-riscv64gc-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3021ad1c6f5c5d177546f9890acaac105fbfc211bfd4b11fc06156f85112df09 -size 250151976 +oid sha256:bc2760ab21d5531fafb867f244f045fa3da7bfd16694ea74f77af3695c298867 +size 251333732 diff --git a/rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz b/rust-1.90.0-x86_64-unknown-linux-gnu.tar.xz similarity index 32% rename from rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz rename to rust-1.90.0-x86_64-unknown-linux-gnu.tar.xz index 9d59770..d3104f6 100644 --- a/rust-1.88.0-x86_64-unknown-linux-gnu.tar.xz +++ b/rust-1.90.0-x86_64-unknown-linux-gnu.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b5437c1d18a174faae253a18eac22c32288dccfc09ff78d5ee99b7467e21bca -size 197237052 +oid sha256:bff8974f2d3ee6c0e6ac926b533f65bbdd3697d2c2b925bdae5f45b9eed10a67 +size 202999512 diff --git a/rust.spec b/rust.spec index 45f62a4..b083d09 100644 --- a/rust.spec +++ b/rust.spec @@ -1,8 +1,8 @@ %define _lto_cflags %{nil} -%global bootstrap_rust 1.88.0 -%global bootstrap_cargo 1.88.0 -%global bootstrap_channel 1.88.0 -%global bootstrap_date 2025-06-26 +%global bootstrap_rust 1.90.0 +%global bootstrap_cargo 1.90.0 +%global bootstrap_channel 1.90.0 +%global bootstrap_date 2025-08-07 %global bootstrap_arches x86_64 aarch64 riscv64 loongarch64 %bcond_with llvm_static %ifarch x86_64 aarch64 riscv64 @@ -25,8 +25,8 @@ %endif Name: rust -Version: 1.89.0 -Release: 2 +Version: 1.90.0 +Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -41,7 +41,7 @@ Source5: cargo-config.csh Source102: cargo_vendor.attr Source103: cargo_vendor.prov -Patch0000: rustc-1.88.0-disable-libssh2.patch +Patch0000: rustc-1.90.0-disable-libssh2.patch # By default, rust tries to use "rust-lld" as a linker for some targets. Patch0001: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. @@ -117,7 +117,7 @@ BuildRequires: pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1. BuildRequires: %{python} %if %with bundled_llvm BuildRequires: cmake3 >= 3.20.3 -Provides: bundled(llvm) = 20.1.1 +Provides: bundled(llvm) = 20.1.8 %else BuildRequires: cmake >= 3.5.1 %if %defined llvm @@ -211,7 +211,7 @@ programs. %package -n cargo Summary: Rust's package manager and build tool %if %with bundled_libgit2 -Provides: bundled(libgit2) = 1.1.0 +Provides: bundled(libgit2) = 1.9.1 %endif BuildRequires: git Requires: %{name} = %{version}-%{release} @@ -557,6 +557,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Thu Sep 25 2025 jchzhou - 1.90.0-1 +- Update to 1.90.0 + * Wed Sep 24 2025 wangkai <13474090681@163.com> - 1.89.0-2 - Remove rls command - Cleanup spec diff --git a/rustc-1.89.0-src.tar.xz b/rustc-1.89.0-src.tar.xz deleted file mode 100644 index 67e486c..0000000 --- a/rustc-1.89.0-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b9d55610d8270e06c44f459d1e2b7918a5e673809c592abed9b9c600e33d95a -size 267487572 diff --git a/rustc-1.89.0-src.tar.xz.asc b/rustc-1.89.0-src.tar.xz.asc deleted file mode 100644 index 69a18ea..0000000 --- a/rustc-1.89.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJolIKUCRCFq5bm+hvl/gAACcwP/RMAApfQhwjuIxzxAFLRs0m2 -Al+GRyYsCEU0xDeylPNEu3v8q4H6iyPL4sZhZGQ/TGOG6jtLNu6cL6FM+rl0zqgQ -PUleBB7p+ksaFO6zxSJd9VlLbe8ExpGvmLsPrpWeCHLbkHiYBV8iCabel/fq0GqN -SPevw6RZSsYVaed+lx9xGhjW4TVM67E0OLCvuWWM6VQZdY14VkhqvIyC+TFh3b3v -+H1obinUgqp7U3zQUR9w1jQ8/2M8kE7q+ER1RrgFJaog64XxHIaavDjgFepEmWRV -8bbaS4ds3UAEq1SR62riTuna+7jx8KYuceAd1HXj4XG98jSHgU8VPR85way/kX7e -M4XR7rLvIFwmL99zl4qGyw4HDXhslVjgwHKMIRMY2gVjfmrrUz/uj5+hsk7jqgn6 -dLKPTyBt9394sFEsSMj/nVbAbJt4REGtav0lir2c7si0fFcDklDTU8vpZ0YnHDYz -D4zU740d64FbokTcRIlwZ1N63TxC/4R44Q+NWIYsP3SGbkRaTk9z484Sdfqa9n93 -7rkb+Pu3Ft6Re2nkgI4rHKeqycYAtDep7oRKjM6jmuo+bDbw4dWf97xB0+prJfzE -eG6ntMEi0mPhPRCUVpbKftLZKdy1Ti2f9++QNjzSPlbp1ZrtzODlmPoXBZUmcuCB -dXuwHP1NxyIppvQXrP68 -=gpjR ------END PGP SIGNATURE----- diff --git a/rustc-1.88.0-disable-libssh2.patch b/rustc-1.90.0-disable-libssh2.patch similarity index 52% rename from rustc-1.88.0-disable-libssh2.patch rename to rustc-1.90.0-disable-libssh2.patch index bf39d35..23dc6d8 100644 --- a/rustc-1.88.0-disable-libssh2.patch +++ b/rustc-1.90.0-disable-libssh2.patch @@ -1,7 +1,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-06-13 15:47:08.609927319 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-06-13 15:47:54.463092386 -0700 -@@ -2530,7 +2530,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-08-16 15:47:14.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-08-18 17:31:39.554771554 -0700 +@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad dependencies = [ "cc", "libc", @@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "libz-sys", "openssl-sys", "pkg-config", -@@ -2576,20 +2575,6 @@ dependencies = [ +@@ -2847,20 +2846,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools [[package]] name = "libz-rs-sys" diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-06-13 15:47:08.610402846 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-06-13 15:47:51.696071356 -0700 -@@ -46,7 +46,7 @@ curl = "0.4.47" - curl-sys = "0.4.79" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-08-16 15:47:14.000000000 -0700 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-08-18 17:33:02.401743230 -0700 +@@ -46,7 +46,7 @@ curl = "0.4.48" + curl-sys = "0.4.82" filetime = "0.2.25" - flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] } --git2 = "0.20.0" -+git2 = { version = "0.20.0", default-features = false, features = ["https"] } + flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] } +-git2 = "0.20.2" ++git2 = { version = "0.20.2", default-features = false, features = ["https"] } git2-curl = "0.21.0" # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail. - gix = { version = "0.71.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } + gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] } diff --git a/rustc-1.90.0-src.tar.xz b/rustc-1.90.0-src.tar.xz new file mode 100644 index 0000000..e027136 --- /dev/null +++ b/rustc-1.90.0-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bfeaddd90ffda2f063492b092bfed925c4b8c701579baf4b1316e021470daac +size 272348992 diff --git a/rustc-1.90.0-src.tar.xz.asc b/rustc-1.90.0-src.tar.xz.asc new file mode 100644 index 0000000..715f44b --- /dev/null +++ b/rustc-1.90.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJozAZnCRCFq5bm+hvl/gAAxvcP/iIu9X8JHlzqc9WsOZ8kezPS +pedXOWfUMJdq7BvcYBuhu2O84CeWN2ooiR6OnjHs+wdOfsthFFkt4gIJhTEIkUCu +qgRUDNPZZAw7Q6ioOwdnC4p2QUu8YvJLyUtBsG8JMBwsbeX5cXae9tb5QyNGPHqT +hPdmH1cl5OshgH7qZzCZfcLvf9O4BPcNmbPqqVKspqR8EdTFE4D4mBJmzQ/fyf5U +gLJ5lA3AtAxZt62v9gujIUssKfduqrurfCwO19EA7QMjBfHExQLUhLBz7WoOTzDx +Qxj5taVyjF69GOq3Z0k4SeFLnoG88nRZP2BEgPkXEhJZHW0tlM8p6P37MpbdJscj +IAEbhyj/beLRhxFU5OOVERYJ6p2GnoNk4miufcXnS6xMKabP9UPnjhuCxqBFY17q +sPnJBQApZt1OuP0IuGI4DGkbOm/fDxeIK/VdTGfbInYQXSCLaP1h1F+shQbRHVEo +5W9bKfda9DQPUol2px+QSjngqdBcrR0PNKt7+wuqoPBvEhdLHK29up7qxBdTY4lt +L0fyCwapOUmTbzxXqmfy2jct81wEV0l9eRWKVBoFw/vcRmN5ERqtCRCeDU4vPxVk +qV0DvHaMTeX4n4ZGBPak5XuVkn4HKyQ1fUW06/Xb00vudQSApmHTdxDfJybFFbsw +IsvOcxUEEDSwENyftCkG +=+M9Y +-----END PGP SIGNATURE----- -- Gitee