From 988f6dbbed7b7be38f52736da446add2dc4cdb04 Mon Sep 17 00:00:00 2001 From: Stefano Bonicatti Date: Mon, 29 Jul 2024 12:47:40 +0200 Subject: [PATCH] build: Correct xz submodule url and openssl download url (#8383) --- .gitmodules | 2 +- libraries/cmake/formula/openssl/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index d2f17f7a7c1..b45e6722559 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = https://github.com/arangodb/linenoise-ng [submodule "libraries/cmake/source/lzma/src"] path = libraries/cmake/source/lzma/src - url = https://git.tukaani.org/xz.git + url = https://github.com/tukaani-project/xz [submodule "libraries/cmake/source/rapidjson/src"] path = libraries/cmake/source/rapidjson/src url = https://github.com/Tencent/rapidjson diff --git a/libraries/cmake/formula/openssl/CMakeLists.txt b/libraries/cmake/formula/openssl/CMakeLists.txt index ced7a5d9ef2..ec5a70570d0 100644 --- a/libraries/cmake/formula/openssl/CMakeLists.txt +++ b/libraries/cmake/formula/openssl/CMakeLists.txt @@ -187,12 +187,9 @@ function(opensslMain) list(APPEND openssl_c_flags ${OSQUERY_FORMULA_CFLAGS}) string(REPLACE ";" " " openssl_c_flags "${openssl_c_flags}") - string(REGEX MATCH "[0-9]\.[0-9]\.[0-9]" OPENSSL_VERSION_NO_PATCH "${OPENSSL_VERSION}") - if("${OSQUERY_OPENSSL_ARCHIVE_PATH}" STREQUAL "") set(openssl_urls - "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" - "https://www.openssl.org/source/old/${OPENSSL_VERSION_NO_PATCH}/openssl-${OPENSSL_VERSION}.tar.gz" + "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz" ) else() if(NOT EXISTS "${OSQUERY_OPENSSL_ARCHIVE_PATH}" OR IS_DIRECTORY "${OSQUERY_OPENSSL_ARCHIVE_PATH}")