Skip to content

Commit

Permalink
[OpenSSL] support for "no-autoload-config" config option (#18389)
Browse files Browse the repository at this point in the history
* [OpenSSL]: support for "no-autoload-config" config option

OpenSSL has "no-autoload-config" config option,
which disables automatic config loading:

  openssl/openssl#5959

This patch allows to set above option via variable
in custom triplet:

  # build-openssl-no-autoload-config.cmake
  set(OPENSSL_NO_AUTOLOAD_CONFIG ON)

and use it like:

  vcpkg install --overlay-triplets=<path-to-triplets> \
    openssl:build-openssl-no-autoload-config

Signed-off-by: Lev Stipakov <lev@openvpn.net>

* [OpenSSL] bump version

Signed-off-by: Lev Stipakov <lev@openvpn.net>
  • Loading branch information
lstipakov committed Jul 1, 2021
1 parent 7039130 commit 06f8fd6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ports/openssl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openssl",
"version-string": "1.1.1k",
"port-version": 5,
"port-version": 6,
"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"
}
4 changes: 4 additions & 0 deletions ports/openssl/windows/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED)
set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared)
endif()

if(OPENSSL_NO_AUTOLOAD_CONFIG)
set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config)
endif()

set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS})

if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4606,7 +4606,7 @@
},
"openssl": {
"baseline": "1.1.1k",
"port-version": 5
"port-version": 6
},
"openssl-unix": {
"baseline": "1.1.1h",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openssl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3",
"version-string": "1.1.1k",
"port-version": 6
},
{
"git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7",
"version-string": "1.1.1k",
Expand Down

0 comments on commit 06f8fd6

Please sign in to comment.