diff --git a/cmake-adopt-libarchive-3.8.2.patch b/cmake-adopt-libarchive-3.8.2.patch new file mode 100644 index 0000000000000000000000000000000000000000..27480bd71eb9cff13078436eec4a227f29309aae --- /dev/null +++ b/cmake-adopt-libarchive-3.8.2.patch @@ -0,0 +1,45 @@ +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 4b99f03a5bb2fc8f5aa1ddb844ff390f2e32c0c0..e659e64b6281431cce1ed35e4d419f077bfafbb6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -18,7 +18,7 @@ Name: cmake Version: 3.31.9 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 1 +Release: 2 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: https://www.cmake.org @@ -30,6 +30,7 @@ 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 @@ -273,6 +274,9 @@ popd %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Mon Nov 10 2025 Funda Wang - 3.31.9-2 +- fix build with libarchive 3.8.2 + * Mon Sep 29 2025 Funda Wang - 3.31.9-1 - update to 3.31.9