rpms/rust
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to Rust 1.97.1

Browse Source 
Resolves: RHEL-194338
Resolves: RHEL-141250
This commit is contained in:
Paul Murphy 2026-06-02 16:11:00 -05:00
parent f2c6c398d7
commit 5fd7cdea7d
6 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -469,3 +469,5 @@
/wasi-libc-wasi-sdk-32.tar.gz
/rustc-1.96.0-src.tar.xz
/rustc-1.96.0-src.tar.xz.asc
/rustc-1.97.1-src.tar.xz
/rustc-1.97.1-src.tar.xz.asc

14
rust.spec
View File

@ -1,5 +1,5 @@
Name: rust
Version: 1.96.0
Version: 1.97.1
Release: %autorelease
Summary: The Rust Programming Language
License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
@ -14,9 +14,9 @@ ExclusiveArch: %{rust_arches}
# To bootstrap from scratch, set the channel and date from src/stage0
# e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26
# or nightly wants some beta-YYYY-MM-DD
%global bootstrap_version 1.95.0
%global bootstrap_channel 1.95.0
%global bootstrap_date 2026-04-16
%global bootstrap_version 1.96.0
%global bootstrap_channel 1.96.0
%global bootstrap_date 2026-05-28
# Only the specified arches will use bootstrap binaries.
# NOTE: Those binaries used to be uploaded with every new release, but that was
@ -46,7 +46,7 @@ ExclusiveArch: %{rust_arches}
# See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version
# See src/llvm-project/cmake/Modules/LLVMVersion.cmake for bundled version.
%global min_llvm_version 21.0.0
%global bundled_llvm_version 22.1.2
%global bundled_llvm_version 22.1.6
#global llvm_compat_version 21
%global llvm llvm%{?llvm_compat_version}
%bcond_with bundled_llvm
@ -134,7 +134,7 @@ Patch4: 0001-bootstrap-allow-disabling-target-self-contained.patch
Patch5: 0002-set-an-external-library-path-for-wasm32-wasi.patch
# We don't want to use the bundled library in libsqlite3-sys
Patch6: rustc-1.96.0-unbundle-sqlite.patch
Patch6: rustc-1.97.0-unbundle-sqlite.patch
# stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
Patch7: 0001-only-copy-rustlib-into-stage0-sysroot.patch
@ -148,7 +148,7 @@ Source102: cargo_vendor.attr
Source103: cargo_vendor.prov
# Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
Patch100: rustc-1.96.0-disable-libssh2.patch
Patch100: rustc-1.97.0-disable-libssh2.patch
# Get the Rust triple for any architecture and ABI.
%{lua: function rust_triple(arch, abi)

23
rustc-1.96.0-unbundle-sqlite.patch
View File

@ -1,23 +0,0 @@
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 2026-04-19 23:11:26.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-04-23 13:19:24.942383499 -0700
@@ -3152,7 +3152,6 @@ version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
dependencies = [
- "cc",
"pkg-config",
"vcpkg",
]
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 2026-04-19 23:11:26.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-04-23 13:19:13.141462455 -0700
@@ -89,7 +89,7 @@ proptest = "1.11.0"
pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
rand = "0.10.0"
regex = "1.12.3"
-rusqlite = { version = "0.39.0", features = ["bundled"] }
+rusqlite = { version = "0.39.0", features = [] }
rustc-hash = "2.1.2"
rustc-stable-hash = "0.1.2"
rustfix = { version = "0.9.6", path = "crates/rustfix" }

20
rustc-1.96.0-disable-libssh2.patch → rustc-1.97.0-disable-libssh2.patch
View File

@ -1,6 +1,5 @@
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 2026-04-23 13:22:07.239952036 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-04-23 13:23:43.576653041 -0700
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-07-02 11:47:42.914176299 -0500
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-07-02 11:48:03.404372146 -0500
@@ -3108,7 +3108,6 @@ checksum = "c9b3acc4b91781bb0b3386669d32
dependencies = [
"cc",
@ -9,16 +8,16 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
"libz-sys",
"openssl-sys",
"pkg-config",
@@ -3155,20 +3154,6 @@ dependencies = [
@@ -3156,20 +3155,6 @@ dependencies = [
"pkg-config",
"vcpkg",
]
-
-[[package]]
-name = "libssh2-sys"
-version = "0.3.1"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
-checksum = "c04141a07bb0c0bc461cb657808764de571702a59bc5c726c400ac9a7625e3ab"
-dependencies = [
- "cc",
- "libc",
@ -30,15 +29,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
[[package]]
name = "libz-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 2026-04-23 13:22:07.240372063 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-04-23 13:23:37.142696088 -0700
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-07-02 11:47:42.916176318 -0500
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-07-02 11:48:12.603460071 -0500
@@ -51,7 +51,7 @@ filetime = "0.2.27"
flate2 = { version = "1.1.9", default-features = false, features = ["zlib-rs"] }
futures = { version = "0.3.32", default-features = false, features = ["std", "executor"]}
futures = { version = "0.3.32", default-features = false, features = ["std", "executor", "async-await"]}
futures-timer = "3.0.3"
-git2 = "0.20.4"
+git2 = { version = "0.20.4", 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.81.0", default-features = false, features = ["sha1", "progress-tree", "parallel", "dirwalk", "status"] }
gix = { version = "0.83.0", default-features = false, features = ["sha1", "progress-tree", "parallel", "dirwalk", "status"] }

21
rustc-1.97.0-unbundle-sqlite.patch Normal file
View File

@ -0,0 +1,21 @@
--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2026-06-02 15:55:01.625762200 -0500
+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2026-06-02 15:56:06.143120013 -0500
@@ -3152,7 +3152,6 @@ version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
dependencies = [
- "cc",
"pkg-config",
"vcpkg",
]
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2026-06-02 15:54:48.946691882 -0500
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2026-06-02 15:56:21.480430158 -0500
@@ -88,7 +88,7 @@ proptest = "1.11.0"
pulldown-cmark = { version = "0.13.3", default-features = false, features = ["html"] }
rand = "0.10.1"
regex = "1.12.3"
-rusqlite = { version = "0.39.0", features = ["bundled"] }
+rusqlite = { version = "0.39.0", features = [] }
rustc-hash = "2.1.2"
rustc-stable-hash = "0.1.2"
rustfix = { version = "0.9.7", path = "crates/rustfix" }

4
sources
View File

@ -1,3 +1,3 @@
SHA512 (rustc-1.96.0-src.tar.xz) = 4f93df2c8ab5f4c7eb374b96a2dc4be4b134fbe8cf3db777118bd1aad12d3bb0b382c26864fa5d7d7959384701259edc7794a885d710565a91491bbaa337f789
SHA512 (rustc-1.96.0-src.tar.xz.asc) = dc655238ea83bcf7c390c398dfce3925b0d13febbbe6a9a15f5f55ba51cbcb22c0e390fc63aadd9173930b9eaee94d2bb607c19f472efdf07b58cafe63376419
SHA512 (rustc-1.97.1-src.tar.xz) = a04178bf0f2c43cbb503a5ea48145eebfee371766a589c0855079ae6a7f3945223850dcc6bce2a94b9f9ead1595d99de09bb00cd6180300e0da58dc247f043eb
SHA512 (rustc-1.97.1-src.tar.xz.asc) = 9d3ca698b1a1a453cac8758622609414f10868e8890491d8cd8c0eed796b689623f91cc28377c1e4c33095f02e92af7d1230458fe4e1fd830b6139799af50f32
SHA512 (wasi-libc-wasi-sdk-32.tar.gz) = 5a07d2d21789c7ad8669d87a33bd0d397b2c64ebb11de81ee3c1c027754a9a88e06c524526b4b7170fa4dfd7e1bfec0a5f58757103a6fe1a8ab136abc7e8a190