Update curl to v7.73.0

Remove the FindBrotli module since it is now included. Update to USE_SCHANNEL
for Windows native SSL. Add a feature flag for the CA bundle so it can be disabled.

Author: donny-dont

README.md

@@ -20,7 +20,7 @@
 | [brotli](https://github.com/google/brotli) | 1.0.9 | 2020-08-27 |
 | [libressl](https://www.libressl.org) | 3.2.1 | 2020-08-24 |
 | [nghttp2](https://nghttp2.org) | 1.41.0 | 2020-06-02 |
-| [curl](https://curl.haxx.se) | 7.72.0 | 2020-08-19 |
+| [curl](https://curl.haxx.se) | 7.73.0 | 2020-10-14 |
 | [libxml2](http://xmlsoft.org/) | 2.9.10 | 2019-10-30 |
 | [libxslt](http://xmlsoft.org/libxslt) | 1.1.34 | 2019-10-30 |
 | [libpng](http://www.libpng.org/pub/png/libpng.html) | 1.6.37 | 2019-04-15 |

WindowsRequirements.json

@@ -3,7 +3,7 @@
     "brotli",
     "libressl",
     "nghttp2",
-    "curl[ssl,ipv6]",
+    "curl[ca-bundle,ssl,ipv6]",
     "icu",
     "libxml2[xslt]",
     "libxslt",

ports/curl/CONTROL

@@ -1,8 +1,12 @@
 Source: curl
-Version: 7.72.0
+Version: 7.73.0
 Build-Depends: zlib, brotli, nghttp2
 Description: A library for transferring data with URLs
 
+Feature: ca-bundle
+Description: |
+  Use the provided certificate bundle.
+
 Feature: ssl
 Build-Depends: libressl
 Description: |

ports/curl/build/CMake/FindBrotli.cmake

@@ -1,13 +1,13 @@
 include(vcpkg_common_functions)
 
-set(VERSION 7.72.0)
+set(VERSION 7.73.0)
 string(REPLACE "." "_" TAG ${VERSION})
 
 # Get archive
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/curl/curl/releases/download/curl-${TAG}/curl-${VERSION}.zip"
     FILENAME "curl-${VERSION}.zip"
-    SHA512 3018061bd33c1c1b8d8b45122540a36846b556a8ade75d176532114f26973aed0b643c8baa0166493519ebcc29385e4b6e8bfcd761e594003971cdbe807d49f3
+    SHA512 66fe22da8a24199f244c501007f51a7188c1f5ae145ad88a247254ee2f612ae3a71c636a5214a2e8518eeaf54849a992f1b8eab1ef9a4b7bac08419931d28185
 )
 
 # Patches
@@ -23,10 +23,6 @@ vcpkg_extract_source_archive_ex(
     PATCHES ${PATCHES}
 )
 
-# Add CMake find module for Brotli that's missing from the distribution
-# Remove once https://github.com/curl/curl/pull/5836 lands in a release
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/build/CMake/FindBrotli.cmake DESTINATION ${SOURCE_PATH}/CMake)
-
 # Run CMake build
 set(BUILD_OPTIONS
     # BUILD options
@@ -52,18 +48,30 @@ set(BUILD_OPTIONS
     -DCURL_DISABLE_POP3=ON
     -DCURL_DISABLE_PROXY=OFF
     -DCURL_DISABLE_RTSP=ON
+    -DCURL_DISABLE_SMB=ON
     -DCURL_DISABLE_SMTP=ON
     -DCURL_DISABLE_TELNET=ON
     -DCURL_DISABLE_TFTP=ON
+    -DCURL_ENABLE_MQTT=OFF
     # ENABLE options
     -DENABLE_ARES=OFF
     -DENABLE_MANUAL=OFF
     -DENABLE_THREADED_RESOLVER=ON
+    -DENABLE_UNIX_SOCKETS=OFF
     # USE options
     -DUSE_NGHTTP2=ON
     -DUSE_WIN32_LDAP=OFF
 )
 
+# Check for ca-bundle feature
+if (ca-bundle IN_LIST FEATURES)
+    message(STATUS "Enabling CA bundle")
+    set(BUILD_OPTIONS ${BUILD_OPTIONS} -DCURL_CA_BUNDLE=auto -DCURL_CA_PATH=auto)
+else ()
+    message(STATUS "Disabling CA bundle")
+    set(BUILD_OPTIONS ${BUILD_OPTIONS} -DCURL_CA_BUNDLE=none -DCURL_CA_PATH=none)
+endif ()
+
 # Check for IPV6 feature
 if (ipv6 IN_LIST FEATURES)
     message(STATUS "Enabling IPV6")
@@ -87,7 +95,7 @@ if (NOT ssl IN_LIST FEATURES)
 
     if (VCPKG_WINDOWS)
         set(USE_OPENSSL OFF)
-        set(USE_WINSSL ON)
+        set(USE_SCHANNEL ON)
     endif ()
 endif ()
 
@@ -110,7 +118,7 @@ vcpkg_configure_cmake(
         ${BUILD_OPTIONS}
         -DCURL_STATICLIB=${CURL_STATICLIB}
         -DCMAKE_USE_OPENSSL=${USE_OPENSSL}
-        -DCMAKE_USE_WINSSL=${USE_WINSSL}
+        -DCMAKE_USE_SCHANNEL=${USE_SCHANNEL}
     OPTIONS_DEBUG
         -DENABLE_DEBUG=ON
 )