From 08efd25095f3e080dfda41950c0ca4c25877c04c Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Fri, 3 Jul 2026 08:50:09 +0300 Subject: [PATCH] Update OpenSSL to 3.5.7 IB-8991 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 2 +- client/Utils.h | 4 +++- client/libcdoc | 2 +- prepare_osx_build_environment.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4020296de..d690d1c84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,7 +70,7 @@ jobs: container: ubuntu:${{ matrix.container }} strategy: matrix: - container: ['22.04', '24.04', '25.10', '26.04'] + container: ['22.04', '24.04', '26.04'] arch: ['amd64', 'arm64'] env: DEBIAN_FRONTEND: noninteractive diff --git a/client/Utils.h b/client/Utils.h index 4038e5f53..c8c317fe7 100644 --- a/client/Utils.h +++ b/client/Utils.h @@ -22,7 +22,9 @@ #include #include #include + #include +#include #include namespace { @@ -81,7 +83,7 @@ namespace { return escaped; } - inline qint64 copyIODevice(QIODevice *from, QIODevice *to, qint64 max = std::numeric_limits::max()) + inline qint64 copyIODevice(QIODevice *from, QIODevice *to, qint64 max = (std::numeric_limits::max)()) { std::array buf{}; qint64 size = 0, i = 0; diff --git a/client/libcdoc b/client/libcdoc index 5b2ea7aed..8e4439ac3 160000 --- a/client/libcdoc +++ b/client/libcdoc @@ -1 +1 @@ -Subproject commit 5b2ea7aedca943886c4e9202f7bfe605b07bae48 +Subproject commit 8e4439ac33a230c825ef7af8477ec4ce57ce14c2 diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index be1aa89ec..26c014e3e 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -5,7 +5,7 @@ set -e ######### Versions of libraries/frameworks to be compiled QT_VER="6.10.3" -OPENSSL_VER="3.5.6" +OPENSSL_VER="3.5.7" OPENLDAP_VER="2.6.13" REBUILD=false BUILD_PATH=~/cmake_builds