From 3c8c9eef1f6058251f048beb94807ffd91224c63 Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Mon, 11 Apr 2022 17:39:59 +0200
Subject: [PATCH] [c-ares] update to 1.18.1 (#24062)

* [c-ares] update to 1.18.1

* patch

* What's going on here?

* I see...

* version

* unsupported on UWP

* version
---
 ports/c-ares/avoid-docs.patch | 13 +++++++++++++
 ports/c-ares/portfile.cmake   | 10 ++++++----
 ports/c-ares/vcpkg.json       |  4 ++--
 scripts/ci.baseline.txt       |  2 --
 versions/baseline.json        |  4 ++--
 versions/c-/c-ares.json       |  5 +++++
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 ports/c-ares/avoid-docs.patch

diff --git a/ports/c-ares/avoid-docs.patch b/ports/c-ares/avoid-docs.patch
new file mode 100644
index 0000000000..cd505ecceb
--- /dev/null
+++ b/ports/c-ares/avoid-docs.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 194485a..e903e50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include)
+ ADD_SUBDIRECTORY (src)
+ 
+ # Docs
+-ADD_SUBDIRECTORY (docs)
++#ADD_SUBDIRECTORY (docs)
+ 
+ # Tests
+ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake
index 29451a9a7c..f21cd6c586 100644
--- a/ports/c-ares/portfile.cmake
+++ b/ports/c-ares/portfile.cmake
@@ -1,16 +1,18 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO c-ares/c-ares
-    REF cares-1_17_2
-    SHA512 1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3
-    HEAD_REF master
+    REF cares-1_18_1
+    SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e
+    HEAD_REF main
+    PATCHES
+        avoid-docs.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCARES_STATIC=${BUILD_STATIC}
         -DCARES_SHARED=${BUILD_SHARED}
diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json
index dea85af0bf..b8f9a87468 100644
--- a/ports/c-ares/vcpkg.json
+++ b/ports/c-ares/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "c-ares",
-  "version-semver": "1.17.2",
-  "port-version": 2,
+  "version-semver": "1.18.1",
   "description": "A C library for asynchronous DNS requests",
   "homepage": "https://github.com/c-ares/c-ares",
+  "license": "MIT",
   "supports": "!uwp",
   "dependencies": [
     {
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 1fe69e276d..bff5328322 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -72,8 +72,6 @@ caf:arm-uwp=fail
 caf:x64-uwp=fail
 caffe2:x86-windows=fail
 caffe2:arm64-windows=fail
-c-ares:arm-uwp=fail
-c-ares:x64-uwp=fail
 
 # file conflict with dbg-macro
 c-dbg-macro:x86-windows=skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 6d9bba345d..ff71a88cf1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1201,8 +1201,8 @@
       "port-version": 2
     },
     "c-ares": {
-      "baseline": "1.17.2",
-      "port-version": 2
+      "baseline": "1.18.1",
+      "port-version": 0
     },
     "c-dbg-macro": {
       "baseline": "2020-02-29",
diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json
index 31f663728e..85b6c17c07 100644
--- a/versions/c-/c-ares.json
+++ b/versions/c-/c-ares.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99",
+      "version-semver": "1.18.1",
+      "port-version": 0
+    },
     {
       "git-tree": "8c97dd38d470b96784d2aa4484d04afca77e2c60",
       "version-semver": "1.17.2",