Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ports/libressl/0001-enable-ocspcheck-on-msvc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 3c80458..e8d3bf5 100644
index 2dddb6e..fd35685 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -1,5 +1,3 @@
Expand All @@ -9,7 +9,7 @@ index 3c80458..e8d3bf5 100644
OCSPCHECK_SRC
http.c
@@ -13,13 +11,27 @@ else()
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
endif()

+check_function_exists(getopt HAVE_GETOPT)
Expand All @@ -34,10 +34,10 @@ index 3c80458..e8d3bf5 100644

-add_executable(ocspcheck ${OCSPCHECK_SRC})
+add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC})
target_include_directories(ocspcheck PUBLIC ../../include)
target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})

@@ -28,5 +40,3 @@ if(ENABLE_LIBRESSL_INSTALL)
@@ -29,5 +41,3 @@ if(ENABLE_LIBRESSL_INSTALL)
install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)

endif(ENABLE_LIBRESSL_INSTALL)
Expand Down
17 changes: 7 additions & 10 deletions ports/libressl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,17 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
return()
endif()

set(LIBRESSL_VERSION 3.4.2)
set(LIBRESSL_HASH ae91a840b29330681dc2a4f55a9bd760e6fe1bdfb3399017aae3a16bd21b413e97cbb8ba504400f0a1f42757f6128b3fa763d06bae4fc9f2b9dbeea867a57ad2)

vcpkg_download_distfile(
LIBRESSL_SOURCE_ARCHIVE
URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${LIBRESSL_VERSION}.tar.gz"
FILENAME "${PORT}-${LIBRESSL_VERSION}.tar.gz"
SHA512 "${LIBRESSL_HASH}"
URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz"
"https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${VERSION}.tar.gz"
FILENAME "${PORT}-${VERSION}.tar.gz"
SHA512 8fc81e05d1c9f9259d06508ca97d5a1ba5d46b857088c273c20e6b242921f7eac58a1136564ad9831c923758ee63f7b0897c8c6c7b1e53ab8132a995cc559aeb
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}"
REF "${LIBRESSL_VERSION}"
PATCHES
0001-enable-ocspcheck-on-msvc.patch
0002-suppress-msvc-warnings.patch
Expand Down Expand Up @@ -59,7 +56,7 @@ file(REMOVE_RECURSE

vcpkg_copy_pdbs()

file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
Expand Down
7 changes: 2 additions & 5 deletions ports/libressl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
{
"name": "libressl",
"version": "3.4.2",
"version": "3.6.2",
"description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.",
"license": "ISC",
"supports": "!(uwp | arm)",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4345,7 +4345,7 @@
"port-version": 0
},
"libressl": {
"baseline": "3.4.2",
"baseline": "3.6.2",
"port-version": 0
},
"librsvg": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libressl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "dbc5385ec4d693da812158dc9e2c1eaaaf9c6908",
"version": "3.6.2",
"port-version": 0
},
{
"git-tree": "09613175bb9f051a273b68c0520ad4017d8fabd9",
"version": "3.4.2",
Expand Down