diff --git a/101-Update-the-third-party-library-to-0.17.14.patch b/101-Update-the-third-party-library-to-0.17.14.patch new file mode 100644 index 0000000000000000000000000000000000000000..94fbd7232cca710ed68179b474e149f60c4473d8 --- /dev/null +++ b/101-Update-the-third-party-library-to-0.17.14.patch @@ -0,0 +1,25 @@ +From 808a3a44694a742ee9dfadd497d16eed240873d4 Mon Sep 17 00:00:00 2001 +From: tomcruiseqi +Date: Fri, 1 Aug 2025 09:38:35 +0800 +Subject: [PATCH] Update the third party library to 0.17.14 + +--- + src/tools/clippy/lintcheck/ci_crates.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/clippy/lintcheck/ci_crates.toml b/src/tools/clippy/lintcheck/ci_crates.toml +index 629982345..64ed3def3 100644 +--- a/src/tools/clippy/lintcheck/ci_crates.toml ++++ b/src/tools/clippy/lintcheck/ci_crates.toml +@@ -94,7 +94,7 @@ tinyvec = { name = 'tinyvec', version = '1.8.0' } + futures-util = { name = 'futures-util', version = '0.3.31' } + futures-task = { name = 'futures-task', version = '0.3.31' } + sha2 = { name = 'sha2', version = '0.11.0-pre.3' } +-ring = { name = 'ring', version = '0.17.8' } ++ring = { name = 'ring', version = '0.17.14' } + slab = { name = 'slab', version = '0.4.9' } + chrono = { name = 'chrono', version = '0.4.38' } + futures-sink = { name = 'futures-sink', version = '0.3.31' } +-- +2.47.3 + diff --git a/rust.spec b/rust.spec index 6f6662b16e93d402b92d80c7ea3a3546bf0f14fe..4650068729c66b613a2a364ebb9dccfbc5f1b2f7 100644 --- a/rust.spec +++ b/rust.spec @@ -1,4 +1,4 @@ -%global anolis_release 3 +%global anolis_release 4 Name: rust Version: 1.84.1 @@ -142,6 +142,8 @@ Source103: cargo_vendor.prov # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949) Patch100: rustc-1.84.0-disable-libssh2.patch +Patch101: 101-Update-the-third-party-library-to-0.17.14.patch + # Get the Rust triple for any architecture and ABI. %{lua: function rust_triple(arch, abi) abi = abi or "gnu" @@ -589,6 +591,8 @@ rm -rf %{wasi_libc_dir}/dlmalloc/ %patch -P100 -p1 %endif +%patch -P101 -p1 + # Use our explicit python3 first sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure @@ -1059,6 +1063,9 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{_rpmconfigdir}/cargo_vendor.prov %changelog +* Fri Aug 1 2025 tomcruiseqi - 1.84.1-4 +- Add patch to fix CVE-2025-4432 + * Mon Jul 21 2025 mgb01105731 - 1.84.1-3 - Add loongarch64 to macros.rust-srpm