This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/openssl-update in repository https://gitbox.apache.org/repos/asf/celix.git
commit 500c1e77715fe66e7a18444184becaeeaca72b1d Author: PengZheng <[email protected]> AuthorDate: Thu Apr 25 15:07:40 2024 +0800 Allow OpenSSL 3.0 to be used. --- cmake/Findcivetweb.cmake | 2 +- conanfile.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/Findcivetweb.cmake b/cmake/Findcivetweb.cmake index 46310ed1..abd14e4c 100644 --- a/cmake/Findcivetweb.cmake +++ b/cmake/Findcivetweb.cmake @@ -25,7 +25,7 @@ if (NOT civetweb_FOUND) civetweb GIT_REPOSITORY https://github.com/civetweb/civetweb.git # GIT_REPOSITORY https://gitee.com/mirrors/civetweb.git - GIT_TAG eefb26f82b233268fc98577d265352720d477ba4 # V1.15 + GIT_TAG d7ba35bbb649209c66e582d5a0244ba988a15159 # V1.16 ) FetchContent_MakeAvailable(civetweb) if (NOT TARGET civetweb::civetweb) diff --git a/conanfile.py b/conanfile.py index 609082c8..dbb748ad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -340,8 +340,6 @@ class CelixConan(ConanFile): self.requires("mdnsresponder/1310.140.1") # 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1' requires 'zlib/1.2.12' self.requires("zlib/1.2.13", override=True) - # the latest civetweb (1.16) is not ready for openssl3 - self.requires("openssl/1.1.1t", override=True) self.validate() def generate(self):
