diff --git a/.github/CMakeLists.txt b/.github/CMakeLists.txt index f5bd308c..e4816127 100644 --- a/.github/CMakeLists.txt +++ b/.github/CMakeLists.txt @@ -42,8 +42,8 @@ externalproject_add( libreSSLExternal DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslDownload SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource - URL "https://mirror.leaseweb.com/pub/OpenBSD/LibreSSL/libressl-3.7.2.tar.gz" - URL_HASH SHA256=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7 + URL "https://mirror.leaseweb.com/pub/OpenBSD/LibreSSL/libressl-3.8.2.tar.gz" + URL_HASH SHA256=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954 PATCH_COMMAND "${Patch_EXECUTABLE}" -p1 --forward -d ${CMAKE_CURRENT_BINARY_DIR}/libreSslSource < ${CMAKE_CURRENT_SOURCE_DIR}/ciPatches/libressl-no_postfix.patch || echo "Patch returned non-zero" CMAKE_ARGS -DLIBRESSL_APPS:BOOL=0 diff --git a/.github/ciPatches/libressl-no_postfix.patch b/.github/ciPatches/libressl-no_postfix.patch index a07aae7c..4cbc41af 100644 --- a/.github/ciPatches/libressl-no_postfix.patch +++ b/.github/ciPatches/libressl-no_postfix.patch @@ -6,7 +6,7 @@ index b1ded85..50f934a 100644 export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym) target_link_libraries(crypto ${PLATFORM_LIBS}) if (WIN32) -- set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION}) +- set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE) + set(CRYPTO_POSTFIX "") endif() set_target_properties(crypto PROPERTIES @@ -19,7 +19,7 @@ index 3310931..0066bff 100644 export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym) target_link_libraries(ssl crypto ${PLATFORM_LIBS}) if (WIN32) -- set(SSL_POSTFIX -${SSL_MAJOR_VERSION}) +- set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE) + set(SSL_POSTFIX "") endif() set_target_properties(ssl PROPERTIES @@ -32,7 +32,7 @@ index 9aa10e1..c0547b2 100644 export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym) target_link_libraries(tls ${PLATFORM_LIBS}) if (WIN32) -- set(TLS_POSTFIX -${TLS_MAJOR_VERSION}) +- set(TLS_POSTFIX -${TLS_MAJOR_VERSION} PARENT_SCOPE) + set(TLS_POSTFIX "") endif() set_target_properties(tls PROPERTIES