From 36c15e96eeda56fcc46b37435eddfb3d43702e80 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 15 Dec 2025 00:45:10 -0500 Subject: [PATCH 1/3] Update disable-libssh2 patch for 1.92.0 --- rust.spec | 2 +- ...isable-libssh2.patch => rustc-1.92.0-disable-libssh2.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename rustc-1.90.0-disable-libssh2.patch => rustc-1.92.0-disable-libssh2.patch (97%) diff --git a/rust.spec b/rust.spec index 663275c..af88a70 100644 --- a/rust.spec +++ b/rust.spec @@ -152,7 +152,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.90.0-disable-libssh2.patch +Patch100: rustc-1.92.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) diff --git a/rustc-1.90.0-disable-libssh2.patch b/rustc-1.92.0-disable-libssh2.patch similarity index 97% rename from rustc-1.90.0-disable-libssh2.patch rename to rustc-1.92.0-disable-libssh2.patch index 23dc6d8..a03668f 100644 --- a/rustc-1.90.0-disable-libssh2.patch +++ b/rustc-1.92.0-disable-libssh2.patch @@ -34,8 +34,8 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools --- 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" + curl-sys = "0.4.83" + filetime = "0.2.26" 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"] } From 65fd388eb79f84abce60d592a076ccfd903cc89d Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Mon, 15 Dec 2025 19:45:10 +0100 Subject: [PATCH 2/3] Update rpminspect.yaml Add known exceptions for unicode test. --- rpminspect.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index 2a29d4a..a12c8a4 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -12,12 +12,14 @@ unicode: # they are tests for those. - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs + - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs + - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs - rustc-*-src/compiler/rustc_lint_defs/src/builtin.rs - rustc-*-src/vendor/idna/tests/IdnaTestV2.txt - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt - - rustc-*-src/vendor/mdbook*/tests/dummy_book/src/first/unicode.md - - rustc-*-src/vendor/mdbook*/tests/searchindex_fixture.json + - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js + - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat From a9b80468cac9ee08f6a1cea6cf5ef85a0f83192b Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 8 Jan 2026 17:07:11 -0800 Subject: [PATCH 3/3] Use %shrink for multi-line cargo_test_skip_list This fixes macro expansion errors on el8-era rpm. [skip changelog] --- rust.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index af88a70..b789949 100644 --- a/rust.spec +++ b/rust.spec @@ -1079,9 +1079,11 @@ rm -rf "./build/%{rust_triple}/test/" %endif %if %with disabled_libssh2 # These tests need ssh - guaranteed to fail when libssh2 is disabled. -%global cargo_test_skip_list %{cargo_test_skip_list} \\\ - net_err_suggests_fetch_with_cli \\\ +%global cargo_test_skip_list %{shrink: + %{cargo_test_skip_list} + net_err_suggests_fetch_with_cli ssh_something_happens +} %endif %if "%{cargo_test_skip_list}" != "" %define cargo_test_skip --test-args "%(printf -- '--skip %%s ' %{cargo_test_skip_list})"