[libressl] Update to v4.0.0 (#42145)

This commit is contained in:
Don Olmstead 2024-11-15 15:13:13 -08:00 committed by GitHub
parent 2878a7d60f
commit cbbbc62e68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 56 deletions

View File

@ -1,45 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f0dfa0..594c56f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,6 +136,10 @@ if(WIN32)
endif()
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 ntdll bcrypt)
endif()
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
+ message(STATUS "Setting /Qspectre switch")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
+endif()
if(MSVC)
add_definitions(-Dinline=__inline)
@@ -149,16 +153,29 @@ if(MSVC)
"C4127" # conditional expression is constant
"C4146" # unary minus operator applied to unsigned type,
# result still unsigned
+ "C4242" # 'identifier' : conversion from 'type1' to 'type2',
+ # possible loss of data
"C4244" # 'argument' : conversion from 'type1' to 'type2',
# possible loss of data
"C4245" # 'conversion' : conversion from 'type1' to 'type2',
# signed/unsigned mismatch
+ "C4255" # 'function' : no function prototype given:
+ # converting '()' to '(void)'
"C4267" # 'var' : conversion from 'size_t' to 'type',
# possible loss of data
+ "C4388" # 'expression': signed/unsigned mismatch
"C4389" # 'operator' : signed/unsigned mismatch
+ "C4464" # relative include path contains '..'
+ "C4668" # 'symbol' is not defined as a preprocessor macro,
+ # replacing with '0' for 'directives'
"C4706" # assignment within conditional expression
+ "C4710" # 'function' : function not inlined
+ "C4711" # function 'function' selected for inline expansion
+ "C4820" # 'bytes' bytes padding added after construct 'member_name'
"C4996" # The POSIX name for this item is deprecated.
# Instead, use the ISO C and C++ conformant name
+ "C5045" # Compiler will insert Spectre mitigation for memory load
+ # if /Qspectre switch specified
)
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
add_definitions(-D_CRT_SUPPRESS_RESTRICT)

View File

@ -1,11 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2172a48..e7458fd 100644
index 9c3d0d4..cc0e904 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -529,7 +529,7 @@ if(ENABLE_LIBRESSL_INSTALL)
endif()
@@ -512,7 +512,7 @@ if(ENABLE_LIBRESSL_INSTALL)
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
)
if(ENABLE_LIBRESSL_INSTALL)
- if(NOT MSVC)
+ if(1)
# Create pkgconfig files.

View File

@ -5,17 +5,23 @@ endif()
vcpkg_download_distfile(
LIBRESSL_SOURCE_ARCHIVE
URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz"
"https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${VERSION}.tar.gz"
"https://github.com/libressl/portable/releases/download/v{VERSION}/${PORT}-${VERSION}.tar.gz"
FILENAME "${PORT}-${VERSION}.tar.gz"
SHA512 b7b9f47c77fd27787b7c7ae7e78cd831fe9f7f32e280f54952994569bfe69ff03022e349aea9ea734c50b079693c6e15a3c1115ef0093e523437904074da5784
SHA512 b5ec6d1f4e3842ecb487f9a67d86db658d05cbe8cd3fcba61172affa8c65c5d0823aa244065a7233f06c669d04a5a36517c02a2d99d2f2da3c4df729ac243b37
)
vcpkg_download_distfile(WARNINGS_REMOVAL_PATCH
URLS https://github.com/libressl/portable/commit/1996dbc07d129cf2b1d32be384a131b9e6fa5373.diff?full_index=1
FILENAME Disable-additional-MSVC-warnings.patch
SHA512 8e32bd2b14c84a9e7106d5bc0ffc9f6bea712db2087c7b944e9b41a3a6cca0b09adcee2cff9bfd136060d539a34f7dc7d9283ec1c058028cc15410475790f4b6
)
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE "${LIBRESSL_SOURCE_ARCHIVE}"
PATCHES
0002-suppress-msvc-warnings.patch
pkgconfig.diff
${WARNINGS_REMOVAL_PATCH}
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,7 +1,6 @@
{
"name": "libressl",
"version": "3.9.2",
"port-version": 2,
"version": "4.0.0",
"description": [
"LibreSSL is a TLS/crypto stack.",
"It was forked from OpenSSL in 2014 by the OpenBSD project, with goals of modernizing the codebase, improving security, and applying best practice development processes.",

View File

@ -5037,8 +5037,8 @@
"port-version": 0
},
"libressl": {
"baseline": "3.9.2",
"port-version": 2
"baseline": "4.0.0",
"port-version": 0
},
"librsvg": {
"baseline": "2.40.20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b734f8a265b1b45c5cbf6ebedf32e8aca340807f",
"version": "4.0.0",
"port-version": 0
},
{
"git-tree": "a4db7a421fd0fe40d7c56014e8b6cf4e5a9c2525",
"version": "3.9.2",