diff --git a/cmake-3.31.9.tar.gz b/cmake-3.31.10.tar.gz similarity index 32% rename from cmake-3.31.9.tar.gz rename to cmake-3.31.10.tar.gz index 853c16f8ae68d81b254c4aacc3fc2ca9bee606d9..1d2cef8f7830eb3f7422f4f5fc5d164218ba8fec 100644 --- a/cmake-3.31.9.tar.gz +++ b/cmake-3.31.10.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d4fdec04247ca8a8e8f63692f0d0f1e9d6d082a2bdd008dff8ab3ba7215aa83 -size 11714375 +oid sha256:cf06fadfd6d41fa8e1ade5099e54976d1d844fd1487ab99942341f91b13d3e29 +size 11715172 diff --git a/cmake-adopt-libarchive-3.8.2.patch b/cmake-adopt-libarchive-3.8.2.patch deleted file mode 100644 index 27480bd71eb9cff13078436eec4a227f29309aae..0000000000000000000000000000000000000000 --- a/cmake-adopt-libarchive-3.8.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b158201607bf87bcf420466babbd69c4f04a2f46 Mon Sep 17 00:00:00 2001 -From: Funda Wang -Date: Mon, 10 Nov 2025 12:39:59 +0800 -Subject: [PATCH] Adopt to change in libarchive 3.8.2 - -libarchive 3.8.2 enable Zstandard's checksum feature in the zstd write -filter, which will confuse magic number of cmake's test case. ---- - Tests/RunCMake/CommandLineTar/pax-zstd.cmake | 7 ++++++- - Tests/RunCMake/File_Archive/pax-zstd.cmake | 7 ++++++- - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/Tests/RunCMake/CommandLineTar/pax-zstd.cmake b/Tests/RunCMake/CommandLineTar/pax-zstd.cmake -index c2a304d8..9ada244e 100644 ---- a/Tests/RunCMake/CommandLineTar/pax-zstd.cmake -+++ b/Tests/RunCMake/CommandLineTar/pax-zstd.cmake -@@ -7,4 +7,9 @@ set(DECOMPRESSION_FLAGS xvf) - - include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake) - --check_magic("28b52ffd0058" LIMIT 6 HEX) -+find_package(LibArchive) -+if(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") -+ check_magic("28b52ffd0458" LIMIT 6 HEX) -+else(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") -+ check_magic("28b52ffd0058" LIMIT 6 HEX) -+endif(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") -diff --git a/Tests/RunCMake/File_Archive/pax-zstd.cmake b/Tests/RunCMake/File_Archive/pax-zstd.cmake -index ba3036ea..a0abadc3 100644 ---- a/Tests/RunCMake/File_Archive/pax-zstd.cmake -+++ b/Tests/RunCMake/File_Archive/pax-zstd.cmake -@@ -5,4 +5,9 @@ set(COMPRESSION_TYPE Zstd) - - include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake) - --check_magic("28b52ffd0058" LIMIT 6 HEX) -+find_package(LibArchive) -+if(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") -+ check_magic("28b52ffd0458" LIMIT 6 HEX) -+else(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") -+ check_magic("28b52ffd0058" LIMIT 6 HEX) -+endif(${LibArchive_VERSION} VERSION_GREATER_EQUAL "3.8.2") --- -2.47.3 - diff --git a/cmake.spec b/cmake.spec index e659e64b6281431cce1ed35e4d419f077bfafbb6..1b2f3faf68e20d8cd6c9834869f91043296bac81 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,9 +16,8 @@ %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/cmake-%{version}} Name: cmake -Version: 3.31.9 -%global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 2 +Version: 3.31.10 +Release: 1 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: https://www.cmake.org @@ -30,7 +29,6 @@ Source4: cmake.prov Source5: cmake.req Patch0: cmake-findruby.patch Patch1: cmake-3.31.6-sw.patch -Patch2: cmake-adopt-libarchive-3.8.2.patch # https://gitlab.kitware.com/cmake/cmake/-/commit/37e27f71bc356d880c908040cd0cb68fa2c371b8 Patch6001: backport-CVE-2025-9301.patch @@ -61,7 +59,7 @@ BuildRequires: libuv-devel xz-devel zlib-devel cmake-rpm-macros Requires: cmake-data = %{version}-%{release} cmake-rpm-macros = %{version}-%{release} Requires: cmake-filesystem = %{version}-%{release} -Provides: cmake%{major_version} = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) +Provides: cmake%{version_major} = %{version}-%{release} bundled(md5-deutsch) bundled(kwsys) bundled(cppdap) %description CMake is used to control the software compilation process using simple @@ -157,7 +155,7 @@ install -d %{buildroot}%{_pkgdocdir} find %{buildroot}%{_datadir}/cmake/Modules -type f | xargs chmod -x for f in ccmake cmake cpack ctest; do - ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; + ln -s $f %{buildroot}%{_bindir}/${f}%{version_major}; done %if %{with emacs} @@ -171,7 +169,7 @@ rm -f %{buildroot}%{_emacs_sitelispdir} %endif install -p -m0644 -D %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} -sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} +sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{version_major}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} touch -r %{S:2} %{buildroot}%{_rpmmacrodir}/macros.%{name} install -p -m0644 -D %{S:3} %{buildroot}%{_fileattrsdir}/cmake.attr install -p -m0755 -D %{S:4} %{buildroot}%{_rpmconfigdir}/cmake.prov @@ -274,6 +272,9 @@ popd %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Tue Nov 18 2025 Funda Wang - 3.31.10-1 +- update to 3.31.10 + * Mon Nov 10 2025 Funda Wang - 3.31.9-2 - fix build with libarchive 3.8.2