Skip to content

Commit ec85773

Browse files
scareythingscareything
authored
update ziti-tunnel-sdk-c@v1.11.1 (#319)
* freshen openssl overlay for vcpkg 2026.02.07 / openssl 3.6.1 * update ziti-tunnel-sdk-c@v1.11.1
1 parent 284fdb7 commit ec85773

File tree

9 files changed

+86
-15
lines changed

9 files changed

+86
-15
lines changed

‎deps/vcpkg-overlays/openssl/cmake-config.patch‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
2-
index 4c24cae..2792083 100644
2+
index 09303c4..487ff68 100644
33
--- a/Configurations/unix-Makefile.tmpl
44
+++ b/Configurations/unix-Makefile.tmpl
55
@@ -338,7 +338,7 @@ bindir={- file_name_is_absolute($bindir)
@@ -25,10 +25,20 @@ index 894834c..d6d3c41 100644
2525
##### User defined commands and flags ################################
2626

2727
diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in
28-
index 2d23219..3477e20 100644
28+
index 766aebe..026680a 100644
2929
--- a/exporters/cmake/OpenSSLConfig.cmake.in
3030
+++ b/exporters/cmake/OpenSSLConfig.cmake.in
31-
@@ -136,6 +136,14 @@ set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installda
31+
@@ -91,8 +91,7 @@ get_filename_component(_ossl_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH)
32+
{-
33+
# For each component in $OpenSSL::safe::installdata::CMAKECONFIGDIR[0] relative to
34+
# $OpenSSL::safe::installdata::PREFIX[0], have CMake figure out the parent directory.
35+
- my $d = join('/', unixify(catdir($OpenSSL::safe::installdata::LIBDIR_REL_PREFIX[0],
36+
- $OpenSSL::safe::installdata::CMAKECONFIGDIR_REL_LIBDIR[0]), 1));
37+
+ my $d = 'share/openssl';
38+
$OUT = '';
39+
if ($d ne '.') {
40+
$OUT .= 'get_filename_component(_ossl_prefix "${_ossl_prefix}" PATH)' . "\n"
41+
@@ -141,6 +140,14 @@ set(OPENSSL_APPLINK_SOURCE "${_ossl_prefix}/{- unixify($OpenSSL::safe::installda
3242
{- output_on() if $disabled{uplink}; "" -}
3343
set(OPENSSL_PROGRAM "${OPENSSL_RUNTIME_DIR}/{- platform->bin('openssl') -}")
3444

@@ -43,7 +53,7 @@ index 2d23219..3477e20 100644
4353
# Set up the imported targets
4454
if(_ossl_use_static_libs)
4555
{- output_off() unless $no_static; "" -}
46-
@@ -235,5 +243,6 @@ set_property(TARGET OpenSSL::applink PROPERTY
56+
@@ -240,5 +247,6 @@ set_property(TARGET OpenSSL::applink PROPERTY
4757
INTERFACE_SOURCES "${OPENSSL_APPLINK_SOURCE}")
4858
{- output_on() if $disabled{uplink}; "" -}
4959

‎deps/vcpkg-overlays/openssl/command-line-length.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 8ddb128..52b9ad6 100644
77
my $deps = join(" \\\n" . ' ' x (length($lib) + 2),
88
fill_lines(' ', $COLUMNS - length($lib) - 2, @objs));
99
- my $max_per_call = 500;
10-
+ my $max_per_call = ($^O eq 'msys') ? 80 : 500;
10+
+ my $max_per_call = ($^O eq 'msys' || $^O eq 'cygwin') ? 80 : 500;
1111
my @objs_grouped;
1212
push @objs_grouped, join(" ", splice @objs, 0, $max_per_call) while @objs;
1313
my $fill_lib =

‎deps/vcpkg-overlays/openssl/fix-mingw-build.patch‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c
2+
index a754f285bbe2b..d8ac969d02a69 100644
3+
--- a/ssl/quic/quic_reactor.c
4+
+++ b/ssl/quic/quic_reactor.c
5+
@@ -76,6 +76,12 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor)
6+
}
7+
8+
#if defined(OPENSSL_SYS_WINDOWS)
9+
+
10+
+/* Work around for MinGW builds. */
11+
+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
12+
+# define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
13+
+#endif
14+
+
15+
/*
16+
* On Windows recvfrom() may return WSAECONNRESET when destination port
17+
* used in preceding call to sendto() is no longer reachable. The reset

‎deps/vcpkg-overlays/openssl/portfile.cmake‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@ vcpkg_from_github(
1111
OUT_SOURCE_PATH SOURCE_PATH
1212
REPO openssl/openssl
1313
REF "openssl-${VERSION}"
14-
SHA512 5282e078eb205ef691647e07d65186d81f9328329a06cca209a138adf10b95f12c16742ac61b4ab86e5098c153645ea413088d8263ff7054fdd40decd85b271f
14+
SHA512 07cfcc71336ece71e713aab8be4a05e2b474bfab175d4c7a4ebcf378f4b1478bcf0e4a46ec88fc6163454fdf7fdf375ab856a5de1c444a41420a02510ae1ac7b
1515
PATCHES
1616
cmake-config.patch
1717
command-line-length.patch
1818
script-prefix.patch
19-
asm-armcap.patch
2019
windows/install-layout.patch
2120
windows/install-pdbs.patch
21+
windows/install-programs.diff # https://github.com/openssl/openssl/issues/28744
2222
unix/android-cc.patch
2323
unix/move-openssldir.patch
2424
unix/no-empty-dirs.patch
2525
unix/no-static-libs-for-shared.patch
26+
fix-mingw-build.patch
2627
)
2728

2829
vcpkg_list(SET CONFIGURE_OPTIONS
@@ -32,6 +33,14 @@ vcpkg_list(SET CONFIGURE_OPTIONS
3233
no-docs
3334
)
3435

36+
# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-ec_nistp_64_gcc_128
37+
vcpkg_cmake_get_vars(cmake_vars_file)
38+
include("${cmake_vars_file}")
39+
if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$"
40+
AND VCPKG_TARGET_ARCHITECTURE MATCHES "^(x64|arm64|riscv64|ppc64le)$")
41+
vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ec_nistp_64_gcc_128)
42+
endif()
43+
3544
set(INSTALL_FIPS "")
3645
if("fips" IN_LIST FEATURES)
3746
vcpkg_list(APPEND INSTALL_FIPS install_fips)

‎deps/vcpkg-overlays/openssl/script-prefix.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ index 343cdc1..e48038e 100644
1818
-$ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
1919
+$ENV{PATH} = "$FindBin::Bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
2020

21-
if (! -x $openssl) {
21+
if (!(-f $openssl && -x $openssl)) {
2222
my $found = 0;

‎deps/vcpkg-overlays/openssl/unix/portfile.cmake‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,52 @@ elseif(VCPKG_TARGET_IS_IOS)
7676
message("using openssl arch ${OPENSSL_ARCH}")
7777
# disable that makes linkage error (e.g. require stderr usage)
7878
list(APPEND CONFIGURE_OPTIONS no-ui no-asm)
79+
elseif(VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_WATCHOS)
80+
set(OPENSSL_ARCH iphoneos-cross)
81+
# disable that makes linkage error (e.g. require stderr usage)
82+
list(APPEND CONFIGURE_OPTIONS no-ui no-asm)
7983
elseif(VCPKG_TARGET_IS_OSX)
84+
# Universal builds don't support ASM
85+
if(VCPKG_OSX_ARCHITECTURES MATCHES "arm64" AND VCPKG_OSX_ARCHITECTURES MATCHES "x86_64")
86+
list(APPEND CONFIGURE_OPTIONS no-asm)
87+
endif()
8088
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
8189
set(OPENSSL_ARCH darwin64-arm64)
8290
else()
8391
set(OPENSSL_ARCH darwin64-x86_64)
8492
endif()
85-
elseif(VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD)
86-
set(OPENSSL_ARCH BSD-generic64)
93+
elseif(VCPKG_TARGET_IS_BSD)
94+
set(OPENSSL_ARCH BSD-nodef-generic64)
95+
elseif(VCPKG_TARGET_IS_SOLARIS)
96+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
97+
set(OPENSSL_ARCH solaris64-x86_64-gcc)
98+
else()
99+
set(OPENSSL_ARCH solaris-x86-gcc)
100+
endif()
87101
elseif(VCPKG_TARGET_IS_MINGW)
88102
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
89103
set(OPENSSL_ARCH mingw64)
104+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
105+
set(OPENSSL_ARCH mingwarm64)
90106
else()
91107
set(OPENSSL_ARCH mingw)
92108
endif()
93109
elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
94110
set(OPENSSL_ARCH linux-x32)
95111
vcpkg_list(APPEND CONFIGURE_OPTIONS
96-
threads
97112
no-engine
98113
no-asm
99114
no-sse2
100115
no-srtp
101116
--cross-compile-prefix=
102117
)
118+
# Cf. https://emscripten.org/docs/porting/pthreads.html:
119+
# For Pthreads support, not just openssl but everything
120+
# must be compiled and linked with `-pthread`.
121+
# This makes it a triplet/toolchain-wide setting.
122+
if(NOT " ${VCPKG_DETECTED_CMAKE_C_FLAGS} " MATCHES " -pthread ")
123+
vcpkg_list(APPEND CONFIGURE_OPTIONS no-threads)
124+
endif()
103125
else()
104126
message(FATAL_ERROR "Unknown platform")
105127
endif()
@@ -122,7 +144,7 @@ vcpkg_configure_make(
122144
)
123145
vcpkg_install_make(
124146
${MAKEFILE_OPTIONS}
125-
BUILD_TARGET build_sw
147+
BUILD_TARGET build_inst_sw
126148
)
127149
vcpkg_fixup_pkgconfig()
128150

‎deps/vcpkg-overlays/openssl/vcpkg.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openssl",
3-
"version": "3.3.1",
4-
"port-version": 1,
3+
"version": "3.6.1",
4+
"port-version": 2,
55
"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.",
66
"homepage": "https://www.openssl.org",
77
"license": "Apache-2.0",

‎deps/vcpkg-overlays/openssl/windows/install-programs.diff‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
2+
index b587212..c031cfb 100644
3+
--- a/Configurations/windows-makefile.tmpl
4+
+++ b/Configurations/windows-makefile.tmpl
5+
@@ -134,7 +134,7 @@ INSTALL_FIPSMODULE={-
6+
-}
7+
INSTALL_FIPSMODULECONF=providers\fipsmodule.cnf
8+
INSTALL_PROGRAMS={-
9+
- join(" ", map { quotify1(platform->bin($_)) }
10+
+ join(" ", map { platform->bin($_) }
11+
grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} }
12+
@{$unified_info{programs}})
13+
-}

‎deps/ziti-tunnel-sdk-c‎

0 commit comments

Comments
 (0)