From e980b82057348dfce3f2ca0a0fafb509a6ef633f Mon Sep 17 00:00:00 2001 From: Anil Mahtani <929854+Anilm3@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:51:37 +0000 Subject: [PATCH 1/2] [ASM] Workaround for boost download issues --- appsec/CMakeLists.txt | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/appsec/CMakeLists.txt b/appsec/CMakeLists.txt index 314da3ff31..8377a0199c 100644 --- a/appsec/CMakeLists.txt +++ b/appsec/CMakeLists.txt @@ -1,14 +1,24 @@ cmake_minimum_required(VERSION 3.14) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules") option(HUNTER_STATUS_DEBUG "Print Hunter debug info" OFF) +set(HUNTER_GATE_VERSION "0.25.8") +set(HUNTER_GATE_SHA1 "26c79d587883ec910bce168e25f6ac4595f97033") +string(SUBSTRING ${HUNTER_GATE_SHA1} 0 8 HUNTER_GATE_SHORT_SHA1) + include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/cpp-pm/hunter/archive/v0.25.3.tar.gz" - SHA1 "0dfbc2cb5c4cf7e83533733bdfd2125ff96680cb") + URL "https://github.com/cpp-pm/hunter/archive/v${HUNTER_GATE_VERSION}.tar.gz" + SHA1 ${HUNTER_GATE_SHA1} +) + +# Replace the flaky URL with a more stable one +execute_process( + COMMAND sed -i "s@https://boostorg.jfrog.io/artifactory/main/release/\\([^/]*\\)/source/boost_\\([^.]*\\).tar.bz2@https://archives.boost.io/release/\\1/source/boost_\\2.tar.bz2@g" "_Base/Download/Hunter/${HUNTER_GATE_VERSION}/${HUNTER_GATE_SHORT_SHA1}/Unpacked/cmake/projects/Boost/hunter.cmake" + WORKING_DIRECTORY "${HUNTER_CACHED_ROOT}" +) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hunter-cache.id.in ${CMAKE_CURRENT_SOURCE_DIR}/hunter-cache.id) From 6ae539773f04975aa6bcff68a2e1df5cea32897c Mon Sep 17 00:00:00 2001 From: Anil Mahtani <929854+Anilm3@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:57:02 +0000 Subject: [PATCH 2/2] Fix short SHA1 length --- appsec/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appsec/CMakeLists.txt b/appsec/CMakeLists.txt index 8377a0199c..89b56fdc9d 100644 --- a/appsec/CMakeLists.txt +++ b/appsec/CMakeLists.txt @@ -6,7 +6,7 @@ option(HUNTER_STATUS_DEBUG "Print Hunter debug info" OFF) set(HUNTER_GATE_VERSION "0.25.8") set(HUNTER_GATE_SHA1 "26c79d587883ec910bce168e25f6ac4595f97033") -string(SUBSTRING ${HUNTER_GATE_SHA1} 0 8 HUNTER_GATE_SHORT_SHA1) +string(SUBSTRING ${HUNTER_GATE_SHA1} 0 7 HUNTER_GATE_SHORT_SHA1) include("cmake/HunterGate.cmake") HunterGate(