diff --git a/rpminspect.yaml b/rpminspect.yaml index a12c8a4..2a29d4a 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -12,14 +12,12 @@ 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/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/mdbook*/tests/dummy_book/src/first/unicode.md + - rustc-*-src/vendor/mdbook*/tests/searchindex_fixture.json - 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 diff --git a/rust.spec b/rust.spec index b789949..663275c 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.92.0-disable-libssh2.patch +Patch100: rustc-1.90.0-disable-libssh2.patch # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) @@ -1079,11 +1079,9 @@ 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 %{shrink: - %{cargo_test_skip_list} - net_err_suggests_fetch_with_cli +%global cargo_test_skip_list %{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})" diff --git a/rustc-1.92.0-disable-libssh2.patch b/rustc-1.90.0-disable-libssh2.patch similarity index 97% rename from rustc-1.92.0-disable-libssh2.patch rename to rustc-1.90.0-disable-libssh2.patch index a03668f..23dc6d8 100644 --- a/rustc-1.92.0-disable-libssh2.patch +++ b/rustc-1.90.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.83" - filetime = "0.2.26" + curl-sys = "0.4.82" + filetime = "0.2.25" 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"] }