diff --git a/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch b/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch deleted file mode 100644 index 28f02b26df1178914830e6912bfca720a5dd432b..0000000000000000000000000000000000000000 --- a/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f72734ff7712d6aae837f940a45d6e7508bb182c Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 20 Oct 2022 13:38:20 -0400 -Subject: [PATCH] Tests: Explicitly allow usage of git file-based protocol in - test cases - -Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by -default. The change has also been backported to other Git versions by -distros. This breaks some of our test cases that use the file-based -protocol locally to simulate real workflows without requiring network -access. In these cases the file protocol is safe, so explicitly enable -it in the tests. - -(cherry picked from commit 79ce0f434e916684d734e136b92e14f472a9d14a) ---- - Tests/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 8e7c04fbd0..d011020f99 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -1540,6 +1540,7 @@ if(BUILD_TESTING) - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject") - set_tests_properties(ExternalProject PROPERTIES -+ ENVIRONMENT GIT_ALLOW_PROTOCOL=file - RUN_SERIAL 1 - TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) - -@@ -2653,6 +2654,7 @@ if(BUILD_TESTING) - -P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake" - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}") -+ set_property(TEST CTest.UpdateGIT PROPERTY ENVIRONMENT GIT_ALLOW_PROTOCOL=file) - endif() - - # Test CTest Update with HG --- -2.31.1 - diff --git a/cmake-3.20-CPACK_THREADS.patch b/cmake-3.20-CPACK_THREADS.patch deleted file mode 100644 index 354f58540ba8f7bf217f094a57ddce6f8cfdf295..0000000000000000000000000000000000000000 --- a/cmake-3.20-CPACK_THREADS.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake ---- cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS 2021-03-23 10:43:17.000000000 -0500 -+++ cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-03-23 13:29:14.539434722 -0500 -@@ -1,6 +1,6 @@ - install(FILES CMakeLists.txt DESTINATION foo COMPONENT test) - --set(CPACK_THREADS 0) -+set(CPACK_THREADS 4) - - if(PACKAGING_TYPE STREQUAL "COMPONENT") - set(CPACK_COMPONENTS_ALL test) diff --git a/cmake-add-sw.patch b/cmake-add-sw.patch index db8a16ae6474b6ef79fd1bcc3636275eca9c3827..81996a7327024a567b8ca8d2705daa8b51d87d01 100644 --- a/cmake-add-sw.patch +++ b/cmake-add-sw.patch @@ -15,23 +15,14 @@ diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 5aa2d601..c8463c10 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake -@@ -61,6 +61,8 @@ macro(java_append_library_directories _var) - set(_java_libarch "i386") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") - set(_java_libarch "arm64" "aarch64") -+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") -+ set(_java_libarch "sw_64") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") - set(_java_libarch "alpha") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") @@ -363,6 +365,7 @@ find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h ${JAVA_INCLUDE_PATH}/solaris ${JAVA_INCLUDE_PATH}/hp-ux ${JAVA_INCLUDE_PATH}/alpha + ${JAVA_INCLUDE_PATH}/sw_64 ${JAVA_INCLUDE_PATH}/aix + DOC "jni_md.h jniport.h include directory" ) - diff --git a/Utilities/KWIML/include/kwiml/abi.h b/Utilities/KWIML/include/kwiml/abi.h index 0437854d..91a37046 100644 --- a/Utilities/KWIML/include/kwiml/abi.h diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch deleted file mode 100644 index dadbff409f5adbc6ec5ffcc125300b66cd17cbff..0000000000000000000000000000000000000000 --- a/cmake-mingw-dl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur cmake-3.18.2.orig/Modules/Platform/Windows-GNU.cmake cmake-3.18.2/Modules/Platform/Windows-GNU.cmake ---- cmake-3.18.2.orig/Modules/Platform/Windows-GNU.cmake 2020-09-08 13:30:51.186087690 +0000 -+++ cmake-3.18.2/Modules/Platform/Windows-GNU.cmake 2020-09-10 07:42:22.458698539 +0000 -@@ -28,9 +28,11 @@ - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32") - set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") -+ set(CMAKE_DL_LIBS "dl") -+else() -+ set(CMAKE_DL_LIBS "") - endif() - --set(CMAKE_DL_LIBS "") - set(CMAKE_LIBRARY_PATH_FLAG "-L") - set(CMAKE_LINK_LIBRARY_FLAG "-l") - set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough diff --git a/cmake.spec b/cmake.spec index 60750e62cd93e73978a7af63acc5d4705abfed22..e6aab89b08a639dd7920c43fe89eadf576cd6664 100644 --- a/cmake.spec +++ b/cmake.spec @@ -60,21 +60,21 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 20 +%global minor_version 26 # Set to RC version if building RC, else %%{nil} #global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 1 # Uncomment if building for EPEL #global name_suffix %%{major_version} %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 +Version: %{major_version}.%{minor_version}.5 Release: %{baserelease}%{?relsuf}%{anolis_release}%{?dist} Summary: Cross-platform make system @@ -105,15 +105,6 @@ Patch100: %{name}-findruby.patch %if 0%{?fedora} && 0%{?fedora} < 34 Patch101: %{name}-fedora-flag_release.patch %endif -# Add dl to CMAKE_DL_LIBS on MINGW -# https://gitlab.kitware.com/cmake/cmake/issues/17600 -Patch102: %{name}-mingw-dl.patch -# memory-hungry tests when building on koji builders with *lots* of cores -# so limit it to some reasonable number (4) -Patch103: cmake-3.20-CPACK_THREADS.patch - -# rhbz#2162696 -Patch105: 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -216,6 +207,11 @@ Provides: bundled(md5-deutsch) # https://fedorahosted.org/fpc/ticket/555 Provides: bundled(kwsys) +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: cmake-doc < %{version}-%{release} + %description CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates @@ -247,8 +243,10 @@ This package contains common data-files for %{name}. Summary: Documentation for %{name} BuildArch: noarch -# license files moved from the doc package to main package. -Conflicts: %{name} <= 3.20.1 +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: %{name} < %{version}-%{release} %description doc This package contains documentation for %{name}. @@ -539,11 +537,13 @@ popd %changelog -* Wed Aug 30 2023 Weisson - 3.20.2-5.0.2 -- SW only support that libraries in /usr/lib. - -* Wed Jun 28 2023 wxiat - 3.20.2-5.0.1 +* Tue Apr 30 2024 wxiat - 3.26.5-1.0.1 - add sw patch +- SW only support that libraries in /usr/lib. (Weisson@linux.alibaba.com) + +* Wed Nov 15 2023 Dominik Rehák - 3.26.5-1 +- Update to version 3.26.5 +- Fix conflict with license files. * Tue Jan 31 2023 Tom Stellard - 3.20.2-5 - Fix test case broken by git fix for CVE-2022-39253 diff --git a/dist b/dist index 9c0e36ec42a2d9bfefacb21ac6354c9ddd910533..37a6f9cba7a88cbcf8ab13c9187a23e686af9edd 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_9 diff --git a/download b/download index 9b1df3ce9b2a0b6db0f2bfbf184c9c790bb6cc68..2f85aa0a7de631b48bdff573d892eb24d6bebe0a 100644 --- a/download +++ b/download @@ -1 +1 @@ -cd0e7735f1e51f30ee3b0844390a464a cmake-3.20.2.tar.gz +9ee1536202da1e803fbc71464825b9c2 cmake-3.26.5.tar.gz