Allow OpenSSL 3.0 to be used.

apache · Apr 25, 2024 · 500c1e7 · 500c1e7
1 parent 0802579
commit 500c1e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -340,8 +340,6 @@ def requirements(self):
             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):