Skip to content

Commit

Permalink
fix(deps): Bump LibreSSL to 3.8.2 (#1207)
Browse files Browse the repository at this point in the history
* fix(deps): Bump LibreSSL to 3.8.2

* fix(libressl): update patch
  • Loading branch information
GoetzGoerisch authored Feb 7, 2024
1 parent ad3df6d commit c70a948
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,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.8.0.tar.gz"
URL_HASH SHA256=12531c1ec808c5c6abeb311899664b0cfed04d4648f456dc959bb93c5f21acac
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 -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
Expand Down
19 changes: 8 additions & 11 deletions .github/ciPatches/libressl-no_postfix.patch
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b1ded85..50f934a 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1005,7 +1005,7 @@ target_include_directories(crypto
@@ -992,7 +992,7 @@ target_include_directories(crypto
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 "")
- set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE)
+ set(CRYPTO_POSTFIX "" PARENT_SCOPE)
endif()
set_target_properties(crypto PROPERTIES
OUTPUT_NAME crypto${CRYPTO_POSTFIX}
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 3310931..0066bff 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -72,7 +72,7 @@ target_include_directories(ssl
@@ -90,7 +90,7 @@ target_include_directories(ssl
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 "")
- set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE)
+ set(SSL_POSTFIX "" PARENT_SCOPE)
endif()
set_target_properties(ssl PROPERTIES
OUTPUT_NAME ssl${SSL_POSTFIX}
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 9aa10e1..c0547b2 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -58,7 +58,7 @@ target_include_directories(tls
@@ -59,7 +59,7 @@ target_include_directories(tls
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
Expand Down

0 comments on commit c70a948

Please sign in to comment.