From b52afc6d026c44f6521bce25baabaef1bc1ee43f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 09:52:58 +0000 Subject: [PATCH] import CS cmake-3.26.5-2.el9 --- .cmake.metadata | 2 +- .gitignore | 2 +- ...-allow-usage-of-git-file-based-proto.patch | 41 ------------ SOURCES/cmake-3.20-CPACK_THREADS.patch | 11 ---- SOURCES/cmake-3.20.4-glibc_libdl.patch | 62 ------------------- SOURCES/cmake-mingw-dl.patch | 21 ------- SPECS/cmake.spec | 37 ++++++----- 7 files changed, 23 insertions(+), 153 deletions(-) delete mode 100644 SOURCES/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch delete mode 100644 SOURCES/cmake-3.20-CPACK_THREADS.patch delete mode 100644 SOURCES/cmake-3.20.4-glibc_libdl.patch delete mode 100644 SOURCES/cmake-mingw-dl.patch diff --git a/.cmake.metadata b/.cmake.metadata index 2d0abdd..474d646 100644 --- a/.cmake.metadata +++ b/.cmake.metadata @@ -1 +1 @@ -0c0c76bd90092bbc36288ffd25d8e7f7ebc3c2e5 SOURCES/cmake-3.20.2.tar.gz +76bca3fc4614d72e32768d9cd6a88967c694ab5d SOURCES/cmake-3.26.5.tar.gz diff --git a/.gitignore b/.gitignore index 75cd037..49508a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cmake-3.20.2.tar.gz +SOURCES/cmake-3.26.5.tar.gz diff --git a/SOURCES/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch b/SOURCES/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch deleted file mode 100644 index 28f02b2..0000000 --- a/SOURCES/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/SOURCES/cmake-3.20-CPACK_THREADS.patch b/SOURCES/cmake-3.20-CPACK_THREADS.patch deleted file mode 100644 index 354f585..0000000 --- a/SOURCES/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/SOURCES/cmake-3.20.4-glibc_libdl.patch b/SOURCES/cmake-3.20.4-glibc_libdl.patch deleted file mode 100644 index 398a332..0000000 --- a/SOURCES/cmake-3.20.4-glibc_libdl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 635ab930f6185d1ec3e4d99109e2edf0533b0d00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Wed, 23 Jun 2021 21:03:15 +0200 -Subject: [PATCH] testDynamicLoader: Use LIBDL_SO macro if defined. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting with glibc v2.34 there is no external version of libdl.so -anymore. It has been merged into the glibc libc.so. - -Assuming libdl.so will be present will break the test, thus the -LIBDL_SO macro should be used. If the macro is not defined on -the system, we ensure it will be defined using the previously -hardcoded value. - -Signed-off-by: Björn Esser ---- - cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -Index: cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx -=================================================================== ---- cmake-3.21.0-rc1.orig/Source/kwsys/testDynamicLoader.cxx -+++ cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx -@@ -8,6 +8,25 @@ - # include /* disable_debugger() API. */ - #endif - -+// Needed for __GLIBC__ test macro. -+#ifdef __linux__ -+# include -+#endif -+ -+// Will define LIBDL_SO macro on systems with glibc. -+#ifdef __GLIBC__ -+# include -+// Define to LIBC_SO, if not defined by above header. -+# ifndef LIBDL_SO -+# define LIBDL_SO LIBC_SO -+# endif -+#endif -+ -+// Define the LIBDL_SO macro, if not defined above. -+#ifndef LIBDL_SO -+# define LIBDL_SO "libdl.so" -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -@@ -107,8 +126,8 @@ int testDynamicLoader(int argc, char* ar - // This one is actually fun to test, since dlopen is by default - // loaded...wonder why :) - res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0); -- res += TestDynamicLoader("libdl.so", "dlopen", 1, 1, 1); -- res += TestDynamicLoader("libdl.so", "TestDynamicLoader", 1, 0, 1); -+ res += TestDynamicLoader(LIBDL_SO, "dlopen", 1, 1, 1); -+ res += TestDynamicLoader(LIBDL_SO, "TestDynamicLoader", 1, 0, 1); - #endif - // Now try on the generated library - std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload"); diff --git a/SOURCES/cmake-mingw-dl.patch b/SOURCES/cmake-mingw-dl.patch deleted file mode 100644 index ef24234..0000000 --- a/SOURCES/cmake-mingw-dl.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake -=================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake -@@ -25,12 +25,14 @@ endif() - - if(MINGW) - set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") -+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".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/SPECS/cmake.spec b/SPECS/cmake.spec index 597cc00..5a49ae9 100644 --- a/SPECS/cmake.spec +++ b/SPECS/cmake.spec @@ -58,21 +58,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 8 +%global baserelease 2 # 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}%{?dist} Summary: Cross-platform make system @@ -103,17 +103,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 -# see rhbz#1975096 -Patch104: cmake-3.20.4-glibc_libdl.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} @@ -211,6 +200,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 @@ -242,8 +236,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}. @@ -534,6 +530,15 @@ popd %changelog +* Fri Nov 03 2023 Tom Stellard - 3.26.5-2 +- Fix conflict with license files. + +* Thu Oct 26 2023 Tom Stellard - 3.26.5-1 +- Update to version 3.26.5-1 + +* Mon Oct 23 2023 Tom Stellard - 3.20.2-9 +- Fix CPack bug with pretrans scriptlet + * Tue Jan 31 2023 Tom Stellard - 3.20.2-8 - Fix test case broken by git fix for CVE-2022-39253