[curl] Update to 8.4.0. (#34405)

This fixes a HIGH severity vulnerability: https://daniel.haxx.se/blog/2023/10/11/curl-8-4-0/

See also: https://daniel.haxx.se/blog/2023/10/11/how-i-made-a-heap-overflow-in-curl/

Resolves: https://github.com/microsoft/vcpkg/issues/34281

ports/curl/0002_fix_uwp.patch

@@ -1,15 +1,24 @@
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 9bb8f0b..7678f43 100644
+index 6f84919..b838245 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -216,6 +216,10 @@ if(BUILD_SHARED_LIBS)
-     $<BUILD_INTERFACE:${CURL_SOURCE_DIR}/include>)
- endif()
- 
-+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+  set_property(TARGET ${LIB_SELECTED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
-+endif()
-+
- add_library(${LIB_NAME} ALIAS ${LIB_SELECTED})
- add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED})
- 
+@@ -162,6 +162,9 @@ if(BUILD_STATIC_LIBS)
+       INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE
+       INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
+   endif()
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
++  endif()
+   if(CMAKEVERSION AND CMAKESONAME)
+     set_target_properties(${LIB_STATIC} PROPERTIES
+       VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME})
+@@ -197,6 +200,9 @@ if(BUILD_SHARED_LIBS)
+       INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE
+       INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
+   endif()
++  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
++  endif()
+   if(CMAKEVERSION AND CMAKESONAME)
+     set_target_properties(${LIB_SHARED} PROPERTIES
+       VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME})

ports/curl/0005_remove_imp_suffix.patch

@@ -1,8 +1,8 @@
 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 7678f43..00f61f8 100644
+index b838245..3199160 100644
 --- a/lib/CMakeLists.txt
 +++ b/lib/CMakeLists.txt
-@@ -105,7 +105,6 @@ endif()
+@@ -92,7 +92,6 @@ endif()
  if(WIN32 AND
     NOT IMPORT_LIB_SUFFIX AND
     CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX)

ports/curl/0012-fix-dependency-idn2.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f6de81..6702845 100644
+index 1b19c68..bb5fba9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -632,6 +632,7 @@ endif()
+@@ -839,7 +839,8 @@ endif()
  # Check for idn2
  option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
  if(USE_LIBIDN2)

ports/curl/0020-fix-pc-file.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b2e428..ea430f4 100644
+index bb5fba9..9919fd3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1505,7 +1505,9 @@ set(includedir              "\${prefix}/include")
+@@ -1624,7 +1624,9 @@ set(includedir              "\${prefix}/include")
  set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
  set(LIBCURL_LIBS            "")
  set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")

ports/curl/0022-deduplicate-libs.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a35ee52..ee133d5 100644
+index 9919fd3..7e513f6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1611,6 +1611,7 @@ if(BUILD_SHARED_LIBS)
+@@ -1654,6 +1654,7 @@ if(BUILD_SHARED_LIBS)
  else()
    set(ENABLE_SHARED         "no")
    set(LIBCURL_NO_SHARED     "${LIBCURL_LIBS}")

ports/curl/cmake-config.patch

@@ -1,8 +1,8 @@
 diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
-index 056907c4f..56f7c9dd9 100644
+index c89c686..2f39949 100644
 --- a/CMake/curl-config.cmake.in
 +++ b/CMake/curl-config.cmake.in
-@@ -35,4 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+@@ -45,4 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
  check_required_components("@PROJECT_NAME@")
  
  # Alias for either shared or static library

ports/curl/dependencies.patch

@@ -1,8 +1,8 @@
 diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
-index dbe4ed2..edf87fa 100644
+index 056907c..c89c686 100644
 --- a/CMake/curl-config.cmake.in
 +++ b/CMake/curl-config.cmake.in
-@@ -31,5 +31,15 @@ if(@USE_ZLIB@)
+@@ -31,6 +31,16 @@ if(@USE_ZLIB@)
    find_dependency(ZLIB @ZLIB_VERSION_MAJOR@)
  endif()
  
@@ -18,11 +18,12 @@ index dbe4ed2..edf87fa 100644
 +
  include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
  check_required_components("@PROJECT_NAME@")
+ 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad3a63d..917cdbf 100644
+index 049ac34..cc0fe19 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -151,7 +151,8 @@ set(CURL_LIBS "")
+@@ -178,7 +178,8 @@ set(CURL_LIBS "")
  
  if(ENABLE_ARES)
    set(USE_ARES 1)
@@ -32,7 +33,7 @@ index ad3a63d..917cdbf 100644
    list(APPEND CURL_LIBS ${CARES_LIBRARY})
  endif()
  
-@@ -524,7 +525,9 @@ endif()
+@@ -590,7 +591,9 @@ endif()
  option(CURL_BROTLI "Set to ON to enable building curl with brotli support." OFF)
  set(HAVE_BROTLI OFF)
  if(CURL_BROTLI)
@@ -43,7 +44,7 @@ index ad3a63d..917cdbf 100644
    if(BROTLI_FOUND)
      set(HAVE_BROTLI ON)
      set(CURL_LIBS "${BROTLI_LIBRARIES};${CURL_LIBS}")  # For 'ld' linker. Emulate `list(PREPEND ...)` to stay compatible with <v3.15 CMake.
-@@ -796,7 +799,13 @@ mark_as_advanced(CURL_USE_LIBSSH2)
+@@ -873,7 +876,13 @@ mark_as_advanced(CURL_USE_LIBSSH2)
  set(USE_LIBSSH2 OFF)
  
  if(CURL_USE_LIBSSH2)

ports/curl/export-components.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 874a237..3974956 100644
+index 7e513f6..049ac34 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1617,8 +1617,17 @@ if(CURL_ENABLE_EXPORT_TARGET)
+@@ -1727,8 +1727,17 @@ if(CURL_ENABLE_EXPORT_TARGET)
    )
  endif()
  

ports/curl/mbedtls-ws2_32.patch

@@ -1,8 +1,8 @@
 diff --git a/CMake/FindMbedTLS.cmake b/CMake/FindMbedTLS.cmake
-index 7bdb197..c8c5a73 100644
+index 814bd97..8b17eac 100644
 --- a/CMake/FindMbedTLS.cmake
 +++ b/CMake/FindMbedTLS.cmake
-@@ -26,6 +26,9 @@ find_library(MBEDX509_LIBRARY mbedx509)
+@@ -28,6 +28,9 @@ find_library(MBEDX509_LIBRARY mbedx509)
  find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
  
  set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")

ports/curl/portfile.cmake

@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
     REF "${curl_version}"
-    SHA512 f4a6a629e42bf635f5fd01e25b6b8c750cd5db20f63d7f2bada4de08851deb4b58135019da8b76028db7f32475d11ae8a53486fb6927a6257a889468da604ce4
+    SHA512 c8550fef49e2f1571f7392a351e10bbdb23821069db1e988094fe27fe0a881a265ba69a2cd34462e630563d153462a975ef70472ba39adaad1c5e5ab45cf7f4f
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch

ports/curl/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "curl",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",

versions/baseline.json

@@ -1993,7 +1993,7 @@
       "port-version": 8
     },
     "curl": {
-      "baseline": "8.3.0",
+      "baseline": "8.4.0",
       "port-version": 0
     },
     "curlpp": {

versions/c-/curl.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6125c796d6e2913a89a2996d7082375ce16b02dd",
+      "version": "8.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "11ef099083754220ca800477b81e5ea6e51730ff",
       "version": "8.3.0",