[curl] Update to 7.22.0 (#13045)

3 files changed, 35 insertions, 19 deletions

diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch
index 16c00db4f..5aa451bf4 100644
--- a/ports/curl/0002_fix_uwp.patch
+++ b/ports/curl/0002_fix_uwp.patch
@@ -13,3 +13,16 @@ index 62b7b33..8a4bd71 100644
  if(WIN32)

    add_definitions(-D_USRDLL)

  endif()

+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 9e47967..7694f04 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -505,7 +505,7 @@ if(USE_QUICHE)

+   cmake_pop_check_state()

+ endif()

+ 

+-if(WIN32)

++if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")

+   set(USE_WIN32_CRYPTO ON)

+ endif()

+ 

diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
index 6f50966de..1207ea9ef 100644
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@@ -1,6 +1,5 @@
 Source: curl
-Version: 7.71.1
-Port-Version: 2
+Version: 7.72.0
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl
 Description: A library for transferring data with URLs
@@ -24,15 +23,18 @@ Feature: ssh
 Build-Depends: curl[core,openssl], libssh2, curl[core,non-http]
 Description: SSH support via libssh2
 
-# SSL backends
 Feature: openssl
 Build-Depends: openssl
 Description: SSL support (OpenSSL)
 
-Feature: winssl
-Description: SSL support (Secure Channel / "WinSSL")
+Feature: schannel
+Description: SSL support (Secure Channel)
 Build-Depends: curl[core,sspi]
 
+Feature: winssl
+Description: Legacy name for schannel
+Build-Depends: curl[schannel]
+
 Feature: mbedtls
 Build-Depends: mbedtls
 Description: SSL support (mbedTLS)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 0ad9cd7a2..2375d5ab9 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF 5a1fc8d33808d7b22f57bdf9403cda7ff07b0670 #curl-7_71_1
-    SHA512 a58d2f23c4fb82610b8d68181fd29a4007983f88950b3eb3362170f3187d86116628151c5e09c713f047aca77cad7b9900bb58e368bbddca31599b4fde0dfa22
+    REF 9d954e49bce3706a9a2efb119ecd05767f0f2a9e #curl-7_72_0
+    SHA512 c6af3d772571d4c12ac797c0f5a29db4081ebb964693f2c1d93527f103afb29744f4ed2dde6832f63b28afc402166be2f1336dc868a46eb9a6a296c95d61ab71
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch
@@ -17,9 +17,9 @@ vcpkg_from_github(
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
 
-# winssl will enable sspi, but sspi do not support uwp
-if(("winssl" IN_LIST FEATURES OR "sspi" IN_LIST FEATURES OR "tool" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP))
-    message(FATAL_ERROR "winssl,sspi,tool are not supported on non-Windows and uwp platforms")
+# schannel will enable sspi, but sspi do not support uwp
+if(("schannel" IN_LIST FEATURES OR "sspi" IN_LIST FEATURES OR "tool" IN_LIST FEATURES) AND (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP))
+    message(FATAL_ERROR "schannel,sspi,tool are not supported on non-Windows and uwp platforms")
 endif()
 
 if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
@@ -29,15 +29,15 @@ endif()
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
     # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location.
-    http2   USE_NGHTTP2
-    openssl CMAKE_USE_OPENSSL
-    mbedtls CMAKE_USE_MBEDTLS
-    ssh     CMAKE_USE_LIBSSH2
-    tool    BUILD_CURL_EXE
-    c-ares  ENABLE_ARES
-    sspi    CURL_WINDOWS_SSPI
-    brotli  CURL_BROTLI
-    winssl  CMAKE_USE_WINSSL
+    http2       USE_NGHTTP2
+    openssl     CMAKE_USE_OPENSSL
+    mbedtls     CMAKE_USE_MBEDTLS
+    ssh         CMAKE_USE_LIBSSH2
+    tool        BUILD_CURL_EXE
+    c-ares      ENABLE_ARES
+    sspi        CURL_WINDOWS_SSPI
+    brotli      CURL_BROTLI
+    schannel    CMAKE_USE_SCHANNEL
     sectransp   CMAKE_USE_SECTRANSP
     
     INVERTED_FEATURES
@@ -71,6 +71,7 @@ vcpkg_configure_cmake(
         -DCURL_STATICLIB=${CURL_STATICLIB}
         -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
         -DENABLE_DEBUG=ON
+        -DCURL_CA_FALLBACK=ON
 )
 
 vcpkg_install_cmake()