MSVSphere Packaging Team
8 months ago
parent
8d829395fb
commit
1947aebc87
@ -1 +1 @@
|
|||||||
0c0c76bd90092bbc36288ffd25d8e7f7ebc3c2e5 SOURCES/cmake-3.20.2.tar.gz
|
76bca3fc4614d72e32768d9cd6a88967c694ab5d SOURCES/cmake-3.26.5.tar.gz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
SOURCES/cmake-3.20.2.tar.gz
|
SOURCES/cmake-3.26.5.tar.gz
|
||||||
|
|||||||
@ -1,41 +0,0 @@
|
|||||||
From f72734ff7712d6aae837f940a45d6e7508bb182c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Brad King <brad.king@kitware.com>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -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)
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
From 635ab930f6185d1ec3e4d99109e2edf0533b0d00 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
||||||
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 <besser82@fedoraproject.org>
|
|
||||||
---
|
|
||||||
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 <be/kernel/OS.h> /* disable_debugger() API. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+// Needed for __GLIBC__ test macro.
|
|
||||||
+#ifdef __linux__
|
|
||||||
+# include <features.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+// Will define LIBDL_SO macro on systems with glibc.
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
+# include <gnu/lib-names.h>
|
|
||||||
+// 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");
|
|
||||||
@ -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
|
|
||||||
Loading…
Reference in new issue