3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-26 17:41:09 +08:00
Code Issues Projects Releases Wiki Activity

[openssl] Update to 3.4.0 (#41727)

Browse Source
This commit is contained in:
Kai Pastor 2024-10-29 21:34:50 +01:00 committed by GitHub
parent 1019f434e2
commit 11faa3f168
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/openssl/cmake-config.patch
View File

@ -1,5 +1,5 @@
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 4c24cae..2792083 100644 index 09303c4..487ff68 100644
--- a/Configurations/unix-Makefile.tmpl --- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl
@@ -338,7 +338,7 @@ bindir={- file_name_is_absolute($bindir) @@ -338,7 +338,7 @@ bindir={- file_name_is_absolute($bindir)
@ -25,10 +25,20 @@ index 894834c..d6d3c41 100644
##### User defined commands and flags ################################ ##### User defined commands and flags ################################
diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in
index 2d23219..3477e20 100644 index 766aebe..026680a 100644
--- a/exporters/cmake/OpenSSLConfig.cmake.in --- a/exporters/cmake/OpenSSLConfig.cmake.in
+++ b/exporters/cmake/OpenSSLConfig.cmake.in +++ b/exporters/cmake/OpenSSLConfig.cmake.in
@@ -136,6 +136,14 @@ set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installda @@ -91,8 +91,7 @@ get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
{-
# For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR[0] relative to
# $OpenSSL::safe::installdata::PREFIX[0], have CMake figure out the parent directory.
- my $d = join('/', unixify(catdir($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0],
- $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR[0]), 1));
+ my $d = 'share/openssl';
$OUT = '';
if ($d ne '.') {
$OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n"
@@ -141,6 +140,14 @@ set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installda
{- output_on() if $disabled{uplink}; "" -} {- output_on() if $disabled{uplink}; "" -}
set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}") set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}")
@ -43,7 +53,7 @@ index 2d23219..3477e20 100644
# Set up the imported targets # Set up the imported targets
if(_ossl_use_static_libs) if(_ossl_use_static_libs)
{- output_off() unless $no_static; "" -} {- output_off() unless $no_static; "" -}
@@ -235,5 +243,6 @@ set_property(TARGET OpenSSL::applink PROPERTY @@ -240,5 +247,6 @@ set_property(TARGET OpenSSL::applink PROPERTY
INTERFACE_SOURCES "${OPENSSL_APPLINK_SOURCE}") INTERFACE_SOURCES "${OPENSSL_APPLINK_SOURCE}")
{- output_on() if $disabled{uplink}; "" -} {- output_on() if $disabled{uplink}; "" -}

9
ports/openssl/portfile.cmake
View File

@ -7,17 +7,11 @@ if(VCPKG_TARGET_IS_EMSCRIPTEN)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif() endif()
vcpkg_download_distfile(PATCH_FIX_BUILD_WITH_OLD_PERL
URLS https://github.com/openssl/openssl/commit/210dc9a50dfd99caa1cf7c3d2fa42850124b1bbc.patch?full_index=1
SHA512 62f69f0e2664dc3b6a3090a3b2e142d50b14467f0e862784d9e306a503d4c34e77cd546d3a04dcf1b059e8300646b8ba5168579a0f2a33cfa9cffcbfd4f309e7
FILENAME openssl-openssl-210dc9a50dfd99caa1cf7c3d2fa42850124b1bbc.patch
)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO openssl/openssl REPO openssl/openssl
REF "openssl-${VERSION}" REF "openssl-${VERSION}"
SHA512 c6c152fa3eb06c8dcd4de9fccfd42165ba98715cc560454930709554bcb060db5a8465b70ee1d53e6df6ddc85507f66da745b1f2e2fae9605d808ea861d8f57d SHA512 d5f78b2e9d7b7b4787c976c4f832b1448bbadf5f9d398a50ef98053f92501768d000aa73673af200568aef4c8a491442ebbee8c43556838f465d4f91dfc2b5ad
PATCHES PATCHES
cmake-config.patch cmake-config.patch
command-line-length.patch command-line-length.patch
@ -29,7 +23,6 @@ vcpkg_from_github(
unix/move-openssldir.patch unix/move-openssldir.patch
unix/no-empty-dirs.patch unix/no-empty-dirs.patch
unix/no-static-libs-for-shared.patch unix/no-static-libs-for-shared.patch
"${PATCH_FIX_BUILD_WITH_OLD_PERL}"
) )
vcpkg_list(SET CONFIGURE_OPTIONS vcpkg_list(SET CONFIGURE_OPTIONS

3
ports/openssl/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "openssl", "name": "openssl",
"version": "3.3.2", "version": "3.4.0",
"port-version": 1,
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
"homepage": "https://www.openssl.org", "homepage": "https://www.openssl.org",
"license": "Apache-2.0", "license": "Apache-2.0",

4
versions/baseline.json
View File

@ -6717,8 +6717,8 @@
"port-version": 4 "port-version": 4
}, },
"openssl": { "openssl": {
"baseline": "3.3.2", "baseline": "3.4.0",
"port-version": 1 "port-version": 0
}, },
"opensubdiv": { "opensubdiv": {
"baseline": "3.5.0", "baseline": "3.5.0",

5
versions/o-/openssl.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ce504a83eb9627d54f1cffdb497a6bf5bd970d18",
"version": "3.4.0",
"port-version": 0
},
{ {
"git-tree": "2c0920b57254210866a89aa705291b452a31df48", "git-tree": "2c0920b57254210866a89aa705291b452a31df48",
"version": "3.3.2", "version": "3.3.2",