c-ares: publish version 1.34.6 (conan-io#29214)

* Added c-ares 1.34.6

* c-ares versions

* c-ares: cleanup

* c-ares: linter fixes

---------

Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>

Author: 2 people

recipes/c-ares/all/conandata.yml

@@ -1,38 +1,8 @@
 sources:
-  "1.34.5":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.34.5/c-ares-1.34.5.tar.gz"
-    sha256: "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346"
-  "1.34.3":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.34.3/c-ares-1.34.3.tar.gz"
-    sha256: "26e1f7771da23e42a18fdf1e58912a396629e53a2ac71b130af93bbcfb90adbe"
-  "1.34.1":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.34.1/c-ares-1.34.1.tar.gz"
-    sha256: "7e846f1742ab5998aced36d170408557de5292b92ec404fb0f7422f946d60103"
-  "1.33.1":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.33.1/c-ares-1.33.1.tar.gz"
-    sha256: "06869824094745872fa26efd4c48e622b9bd82a89ef0ce693dc682a23604f415"
-  "1.33.0":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.33.0/c-ares-1.33.0.tar.gz"
-    sha256: "3e41df2f172041eb4ecb754a464c11ccc5046b2a1c8b1d6a40dac45d3a3b2346"
-  "1.32.3":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.32.3/c-ares-1.32.3.tar.gz"
-    sha256: "5f02cc809aac3f6cc5edc1fac6c4423fd5616d7406ce47b904c24adf0ff2cd0f"
-  "1.32.2":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.32.2/c-ares-1.32.2.tar.gz"
-    sha256: "072ff6b30b9682d965b87eb9b77851dc1cd8e6d8090f6821a56bd8fa89595061"
-  "1.32.1":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.32.1/c-ares-1.32.1.tar.gz"
-    sha256: "63be2c4ee121faa47e9766f735b4cde750fff2c563f81c11e572d3dc6401e5e7"
-  "1.31.0":
-    url: "https://github.com/c-ares/c-ares/releases/download/v1.31.0/c-ares-1.31.0.tar.gz"
-    sha256: "0167a33dba96ca8de29f3f598b1e6cabe531799269fd63d0153aa0e6f5efeabd"
+  "1.34.6":
+    url: "https://github.com/c-ares/c-ares/releases/download/v1.34.6/c-ares-1.34.6.tar.gz"
+    sha256: "912dd7cc3b3e8a79c52fd7fb9c0f4ecf0aaa73e45efda880266a2d6e26b84ef5"
   # keep 1.25.0 for libnghttp2, trantor, libcoro
   "1.25.0":
     url: "https://github.com/c-ares/c-ares/releases/download/cares-1_25_0/c-ares-1.25.0.tar.gz"
     sha256: "71832b93a48f5ff579c505f4869120c14e57b783275367207f1a98314aa724e5"
-patches:
-  "1.33.0":
-    - patch_file: "patches/1.33.0-0001-fix-tcp-fastopen.patch"
-      patch_description: "fix compilation error for TCP_FASTOPEN_CONNECT"
-      patch_type: "portability"
-      patch_source: "https://github.com/c-ares/c-ares/commit/4abdf7de3678d98f474bd2abeedea741f6c50231"

recipes/c-ares/all/conanfile.py

@@ -1,8 +1,7 @@
 from conan import ConanFile
 from conan.tools.apple import is_apple_os
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
-from conan.tools.files import collect_libs, copy, get, rm, rmdir, apply_conandata_patches, export_conandata_patches
-from conan.tools.scm import Version
+from conan.tools.files import collect_libs, copy, get, rm, rmdir
 import os
 
 required_conan_version = ">=1.53.0"
@@ -30,9 +29,6 @@ class CAresConan(ConanFile):
         "multithreading": True,
     }
 
-    def export_sources(self):
-        export_conandata_patches(self)
-
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
@@ -60,7 +56,6 @@ def generate(self):
         tc.generate()
 
     def build(self):
-        apply_conandata_patches(self)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
@@ -85,20 +80,12 @@ def package_info(self):
             self.cpp_info.components["cares"].defines.append("CARES_STATICLIB")
         if self.settings.os == "Linux":
             self.cpp_info.components["cares"].system_libs.append("rt")
-            if Version(self.version) >= "1.23.0":
-                self.cpp_info.components["cares"].system_libs.append("pthread")
+            self.cpp_info.components["cares"].system_libs.append("pthread")
         elif self.settings.os == "Windows":
             self.cpp_info.components["cares"].system_libs.extend(["ws2_32", "advapi32"])
             self.cpp_info.components["cares"].system_libs.append("iphlpapi")
         elif is_apple_os(self):
             self.cpp_info.components["cares"].system_libs.append("resolv")
 
-        # TODO: to remove in conan v2 once cmake_find_package* & pkg_config generators removed
-        self.cpp_info.names["pkg_config"] = "libcares"
-        self.cpp_info.components["cares"].names["cmake_find_package"] = "cares"
-        self.cpp_info.components["cares"].names["cmake_find_package_multi"] = "cares"
-        self.cpp_info.components["cares"].names["pkg_config"] = "libcares"
         self.cpp_info.components["cares"].set_property("cmake_target_name", "c-ares::cares")
         self.cpp_info.components["cares"].set_property("pkg_config_name", "libcares")
-        if self.options.tools:
-            self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))

recipes/c-ares/all/patches/1.33.0-0001-fix-tcp-fastopen.patch

@@ -1,21 +1,5 @@
 versions:
-  "1.34.5":
-    folder: all
-  "1.34.3":
-    folder: all
-  "1.34.1":
-    folder: all
-  "1.33.1":
-    folder: all
-  "1.33.0":
-    folder: all
-  "1.32.3":
-    folder: all
-  "1.32.2":
-    folder: all
-  "1.32.1":
-    folder: all
-  "1.31.0":
+  "1.34.6":
     folder: all
   "1.25.0":
     folder: all