wt: bump dependencies and remove old versions

recipes/wt/all/conandata.yml

@@ -14,18 +14,6 @@ sources:
   "4.6.0":
     url: "https://github.com/emweb/wt/archive/4.6.0.tar.gz"
     sha256: "7f709e132d32c4925e6db0a590c7ccc5613344e8b9052676ef891a25ccb550e6"
-  "4.5.1":
-    url: "https://github.com/emweb/wt/archive/4.5.1.tar.gz"
-    sha256: "c2820646095af5618fc235705c0108797e3898225fb1826f2c6185c405c21a17"
-  "4.5.0":
-    url: "https://github.com/emweb/wt/archive/4.5.0.tar.gz"
-    sha256: "119b1eae83285a153b9c901d3f4f25775c7a460d30b1e48242d7d2d649d61deb"
-  "4.4.0":
-    url: "https://github.com/emweb/wt/archive/4.4.0.tar.gz"
-    sha256: "2eabefea915ecc4deb36f9f67ab30dd3b1f6c73893d76c9d9fa39ac25f4f3690"
-  "4.3.1":
-    url: "https://github.com/emweb/wt/archive/4.3.1.tar.gz"
-    sha256: "6c0130f36c829ed67119679770c2f62d7768a62eaa281bb10070c4cf1b145139"
 patches:
   "4.9.1":
     - patch_file: "patches/4.8.0-0001-use-cci-package.patch"
@@ -47,28 +35,3 @@ patches:
     - patch_file: "patches/4.6.2-0001-use-cci-package.patch"
       patch_description: "use cci package"
       patch_type: "conan"
-  "4.5.1":
-    - patch_file: "patches/4.3.1-0001-use-cci-package.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-  "4.5.0":
-    - patch_file: "patches/4.3.1-0001-use-cci-package.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-    - patch_file: "patches/4.3.1-0002-gcc_11.patch"
-      patch_description: "include limits header"
-      patch_type: "portability"
-  "4.4.0":
-    - patch_file: "patches/4.3.1-0001-use-cci-package.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-    - patch_file: "patches/4.3.1-0002-gcc_11.patch"
-      patch_description: "include limits header"
-      patch_type: "portability"
-  "4.3.1":
-    - patch_file: "patches/4.3.1-0001-use-cci-package.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-    - patch_file: "patches/4.3.1-0002-gcc_11.patch"
-      patch_description: "include limits header"
-      patch_type: "portability"

recipes/wt/all/conanfile.py

@@ -7,7 +7,8 @@
 import os
 import shutil
 
-required_conan_version = ">=1.53.0"
+required_conan_version = ">=1.54.0"
+
 
 class WtConan(ConanFile):
     name = "wt"
@@ -16,6 +17,7 @@ class WtConan(ConanFile):
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/emweb/wt"
     topics = ("server", "web", "webapp", "websocket", "cgi", "fastcgi", "orm")
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -91,26 +93,24 @@ def _required_boost_components(self):
         return ["program_options", "filesystem", "thread"]
 
     def requirements(self):
-        if Version(self.version) < "4.6.0":
-            self.requires("boost/1.76.0")
-        elif Version(self.version) < "4.9.0":
-            self.requires("boost/1.80.0")
+        if Version(self.version) < "4.9.0":
+            self.requires("boost/1.80.0", transitive_headers = True)
         else:
-            self.requires("boost/1.81.0")
+            self.requires("boost/1.82.0", transitive_headers = True)
         if self.options.connector_http:
             self.requires("zlib/1.2.13")
         if self.options.with_ssl:
-            self.requires("openssl/1.1.1t")
+            self.requires("openssl/[>=1.1 <4]")
         if self.options.get_safe("with_sqlite"):
-            self.requires("sqlite3/3.41.1")
+            self.requires("sqlite3/3.42.0")
         if self.options.get_safe("with_mysql"):
             self.requires("libmysqlclient/8.0.31", transitive_headers=True, transitive_libs=True)
         if self.options.get_safe("with_postgres"):
-            self.requires("libpq/14.7", transitive_headers=True, transitive_libs=True)
+            self.requires("libpq/15.3", transitive_headers=True, transitive_libs=True)
         if self.options.get_safe("with_mssql") and self.settings.os != "Windows":
             self.requires("odbc/2.3.11")
         if self.options.get_safe("with_unwind"):
-            self.requires("libunwind/1.6.2")
+            self.requires("libunwind/1.7.0")
 
     def validate(self):
         miss_boost_required_comp = any(self.dependencies["boost"].options.get_safe(f"without_{boost_comp}", True)
@@ -224,8 +224,6 @@ def generate(self):
         else:
             tc.variables["CONNECTOR_FCGI"] = self.options.connector_fcgi
             tc.variables["CONNECTOR_ISAPI"] = False
-
-        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
         tc.generate()
 
         deps = CMakeDeps(self)
@@ -234,12 +232,18 @@ def generate(self):
     def _patch_sources(self):
         apply_conandata_patches(self)
         cmakelists = os.path.join(self.source_folder, "CMakeLists.txt")
-        replace_in_file(self, cmakelists, "find_package(OpenSSL)", "#find_package(OpenSSL)")
         replace_in_file(self, cmakelists, "INCLUDE(cmake/WtFindMysql.txt)", "#INCLUDE(cmake/WtFindMysql.txt)")
         replace_in_file(self, cmakelists, "INCLUDE(cmake/WtFindPostgresql.txt)", "#INCLUDE(cmake/WtFindPostgresql.txt)")
         if self.settings.os != "Windows":
             replace_in_file(self, cmakelists, "INCLUDE(cmake/WtFindOdbc.txt)", "#INCLUDE(cmake/WtFindOdbc.txt)")
 
+        if self.options.with_ssl:
+            # Ensure the conan-generated config is used for OpenSSL when required as a dependency
+            replace_in_file(self, cmakelists, "find_package(OpenSSL)", "find_package(OpenSSL CONFIG REQUIRED)")
+        else:
+            # Avoid searching for OpenSSL if it is not required
+            replace_in_file(self, cmakelists, "find_package(OpenSSL)", "")
+
         # Do not pollute rpath of shared libs of the install tree on macOS please
         replace_in_file(self,
             cmakelists,

recipes/wt/config.yml

@@ -9,11 +9,3 @@ versions:
     folder: all
   "4.6.0":
     folder: all
-  "4.5.1":
-    folder: all
-  "4.5.0":
-    folder: all
-  "4.4.0":
-    folder: all
-  "4.3.1":
-    folder: all