[curl] Update to 8.11.0 (#41982)

2024-11-23 23:49:06 +08:00 · 2024-11-11 09:32:33 +01:00 · 2024-11-11 09:32:33 +01:00 · e9235c7244
commit e9235c7244
parent aaaf563806
13 changed files with 76 additions and 37 deletions
--- a/ports/aliyun-oss-cpp-sdk/disable-werror.diff
+++ b/ports/aliyun-oss-cpp-sdk/disable-werror.diff
@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea0d8d6..c04ec99 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -127,6 +127,7 @@ else()
+ 	endif()
+ endif()
+ 
+list(REMOVE_ITEM SDK_COMPILER_FLAGS "-Werror")
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set(STATIC_LIB_SUFFIX "-static")
--- a/ports/aliyun-oss-cpp-sdk/portfile.cmake
+++ b/ports/aliyun-oss-cpp-sdk/portfile.cmake
@ -7,6 +7,7 @@ vcpkg_from_github(
    PATCHES
        0001-dependency-and-targets.patch
        0003-suppress-fmt-warning.patch
+        disable-werror.diff
 )
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/0002-unofficial-export.cmake" DESTINATION "${SOURCE_PATH}/sdk/")

--- a/ports/aliyun-oss-cpp-sdk/vcpkg.json
+++ b/ports/aliyun-oss-cpp-sdk/vcpkg.json
@ -1,13 +1,16 @@
 {
  "name": "aliyun-oss-cpp-sdk",
  "version": "1.10.0",
-  "port-version": 3,
+  "port-version": 4,
  "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.",
  "homepage": "https://github.com/aliyun/aliyun-oss-cpp-sdk",
  "license": "Apache-2.0",
  "supports": "linux | osx | android",
  "dependencies": [
-    "curl",
+    {
+      "name": "curl",
+      "default-features": false
+    },
    "openssl",
    {
      "name": "vcpkg-cmake",
--- a/ports/curl/0020-fix-pc-file.patch
+++ b/ports/curl/0020-fix-pc-file.patch
@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7242d68..da69699 100644
+index c4ba74d..8a52c2a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1918,7 +1918,9 @@ if(NOT CURL_DISABLE_INSTALL)
-     endif()
-   endforeach()
+@@ -2089,7 +2089,9 @@ if(NOT CURL_DISABLE_INSTALL)
+     set(_implicit_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES})
+   endif()
 
-  foreach(_lib IN LISTS CMAKE_C_IMPLICIT_LINK_LIBRARIES CURL_LIBS)
+-  foreach(_lib IN LISTS _implicit_libs CURL_LIBS)
 +  set(CURL_LIBS_FLAT "")
 +  vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
 +  foreach(_lib IN LISTS CURL_LIBS_FLAT)
--- a/ports/curl/cmake-project-include.cmake
+++ b/ports/curl/cmake-project-include.cmake
@ -89,9 +89,9 @@ if(NOT CURL_DISABLE_LDAP AND NOT WIN32)
    find_package(PkgConfig REQUIRED)
    pkg_check_modules(LDAP REQUIRED ldap)
    set(HAVE_LIBLDAP 1)
-    set(CMAKE_LDAP_INCLUDE_DIR "${LDAP_INCLUDE_DIRS}")
-    set(CMAKE_LDAP_LIB "${LDAP_LINK_LIBRARIES}" CACHE STRING "")
+    set(LDAP_INCLUDE_DIR "${LDAP_INCLUDE_DIRS}")
+    set(LDAP_LIBRARY "${LDAP_LINK_LIBRARIES}" CACHE STRING "")
    pkg_check_modules(LBER REQUIRED lber)
    set(HAVE_LIBLBER 1)
-    set(CMAKE_LBER_LIB "${LBER_LINK_LIBRARIES}" CACHE STRING "")
+    set(LDAP_LBER_LIBRARY "${LBER_LINK_LIBRARIES}" CACHE STRING "")
 endif()
--- a/ports/curl/dependencies.patch
+++ b/ports/curl/dependencies.patch
@ -1,9 +1,9 @@
 diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
-index 7dc1f99..e83617e 100644
+index aa9eb51..c290064 100644
 --- a/CMake/curl-config.cmake.in
 +++ b/CMake/curl-config.cmake.in
-@@ -39,6 +39,19 @@ if(@USE_ZLIB@)
-   find_dependency(ZLIB @ZLIB_VERSION_MAJOR@)
+@@ -38,6 +38,19 @@ if("@HAVE_LIBZ@")
+   find_dependency(ZLIB "@ZLIB_VERSION_MAJOR@")
 endif()
 
 +if("@USE_ARES@")
@ -23,10 +23,10 @@ index 7dc1f99..e83617e 100644
 check_required_components("@PROJECT_NAME@")
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbb0bf4..f1a18d1 100644
+index db3a5ee..a6604e9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -234,7 +234,9 @@ set(LIBCURL_PC_REQUIRES_PRIVATE "")
+@@ -267,7 +267,9 @@ set(LIBCURL_PC_REQUIRES_PRIVATE "")
 
 if(ENABLE_ARES)
   set(USE_ARES 1)
@ -37,7 +37,7 @@ index dbb0bf4..f1a18d1 100644
   list(APPEND CURL_LIBS ${CARES_LIBRARIES})
   list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libcares")
   add_definitions("-DCARES_NO_DEPRECATED")  # Ignore c-ares deprecation warnings
-@@ -611,17 +613,11 @@ if(CURL_USE_WOLFSSL)
+@@ -685,17 +687,11 @@ if(CURL_USE_WOLFSSL)
 endif()
 
 if(CURL_USE_GNUTLS)
@ -60,7 +60,7 @@ index dbb0bf4..f1a18d1 100644
   set(_ssl_enabled ON)
   set(USE_GNUTLS ON)
   list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES} ${NETTLE_LIBRARIES})
-@@ -685,7 +681,9 @@ endif()
+@@ -761,7 +757,9 @@ endif()
 option(CURL_BROTLI "Use brotli" OFF)
 set(HAVE_BROTLI OFF)
 if(CURL_BROTLI)
@ -71,7 +71,7 @@ index dbb0bf4..f1a18d1 100644
   if(BROTLI_FOUND)
     set(HAVE_BROTLI ON)
     list(APPEND CURL_LIBS ${BROTLI_LIBRARIES})
-@@ -698,7 +696,9 @@ endif()
+@@ -773,7 +771,9 @@ endif()
 option(CURL_ZSTD "Use zstd" OFF)
 set(HAVE_ZSTD OFF)
 if(CURL_ZSTD)
@ -82,7 +82,7 @@ index dbb0bf4..f1a18d1 100644
   if(ZSTD_FOUND AND NOT ZSTD_VERSION VERSION_LESS 1.0.0)
     set(HAVE_ZSTD ON)
     list(APPEND CURL_LIBS ${ZSTD_LIBRARIES})
-@@ -1033,7 +1033,9 @@ option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
+@@ -1104,7 +1104,9 @@ option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
 set(HAVE_IDN2_H OFF)
 set(HAVE_LIBIDN2 OFF)
 if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
@ -93,7 +93,7 @@ index dbb0bf4..f1a18d1 100644
   if(LIBIDN2_FOUND)
     set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}")
     list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})
-@@ -1054,7 +1056,17 @@ mark_as_advanced(CURL_USE_LIBPSL)
+@@ -1125,7 +1127,17 @@ mark_as_advanced(CURL_USE_LIBPSL)
 set(USE_LIBPSL OFF)
 
 if(CURL_USE_LIBPSL)
@ -112,7 +112,7 @@ index dbb0bf4..f1a18d1 100644
   if(LIBPSL_FOUND)
     list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl")
-@@ -1072,7 +1084,9 @@ mark_as_advanced(CURL_USE_LIBSSH2)
+@@ -1142,7 +1154,9 @@ mark_as_advanced(CURL_USE_LIBSSH2)
 set(USE_LIBSSH2 OFF)
 
 if(CURL_USE_LIBSSH2)
@ -123,7 +123,7 @@ index dbb0bf4..f1a18d1 100644
   if(LIBSSH2_FOUND)
     list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2")
-@@ -1121,7 +1135,8 @@ endif()
+@@ -1189,7 +1203,8 @@ endif()
 option(CURL_USE_GSASL "Use libgsasl" OFF)
 mark_as_advanced(CURL_USE_GSASL)
 if(CURL_USE_GSASL)
@ -133,7 +133,7 @@ index dbb0bf4..f1a18d1 100644
   if(LIBGSASL_FOUND)
     list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
     list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
-@@ -1139,7 +1154,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
+@@ -1207,7 +1222,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
 mark_as_advanced(CURL_USE_GSSAPI)
 
 if(CURL_USE_GSSAPI)
--- a/ports/curl/export-components.patch
+++ b/ports/curl/export-components.patch
@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a9b844..cd7263d 100644
+index fbb33a1..db3a5ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2044,7 +2044,17 @@ if(NOT CURL_DISABLE_INSTALL)
-       DESTINATION ${CURL_INSTALL_CMAKE_DIR})
+@@ -2254,7 +2254,17 @@ if(NOT CURL_DISABLE_INSTALL)
+       DESTINATION ${_install_cmake_dir})
   endif()
 
 +  set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake")
@ -17,6 +17,6 @@ index 3a9b844..cd7263d 100644
 +
   install(FILES ${_version_config} ${_project_config}
 +                ${components_file}
-     DESTINATION ${CURL_INSTALL_CMAKE_DIR})
+     DESTINATION ${_install_cmake_dir})
 
   # Workaround for MSVS10 to avoid the Dialog Hell
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@ -4,9 +4,10 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO curl/curl
    REF ${curl_version}
-    SHA512 d8d0cdd291f37a6364201fc47e87302604ca5cb10a109818eb4bdd0215e16b6a56aac69f825417166d168f944b638fd15097f665e6e6933cd1a61ca341c3cb26
+    SHA512 d18f453b6ee683a13828ef746cb8d3639f96c759a082736602d7cadaea9dc51bd9b095e5f663aeb9429c2063be3783a24f642ccdb9495b0e0942c501b186322e
    HEAD_REF master
    PATCHES
+        redact-input-vars.diff
        0005_remove_imp_suffix.patch
        0020-fix-pc-file.patch
        0022-deduplicate-libs.patch
@ -31,7 +32,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
        sectransp   CURL_USE_SECTRANSP
        idn2        USE_LIBIDN2
        winidn      USE_WIN32_IDN
-        websockets  ENABLE_WEBSOCKETS
        zstd        CURL_ZSTD
        psl         CURL_USE_LIBPSL
        gssapi      CURL_USE_GSSAPI
@ -41,6 +41,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
        ldap        CURL_DISABLE_LDAP
        ldap        CURL_DISABLE_LDAPS
        non-http    HTTP_ONLY
+        websockets  CURL_DISABLE_WEBSOCKETS
 )

 # Add warning on build failuer when using wolfssl and openssl features togther.
@ -109,13 +110,13 @@ endif()
 #Fix install path
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}" IGNORE_UNCHANGED)
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix=\"\${prefix}\"" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=])
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix='\${prefix}'" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=])
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
 file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/curl-config")
 if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config")
    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}")
    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}" IGNORE_UNCHANGED)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix=\"\${prefix}/debug\"" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=])
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix='\${prefix}/debug'" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=])
    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "-lcurl" "-l${namespec}-d")
    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "curl." "curl-d.")
    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin")
--- a/ports/curl/redact-input-vars.diff
+++ b/ports/curl/redact-input-vars.diff
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c4ba74d..0e8d45f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ foreach(_cache_var ${_cache_vars})
+     else()
+       set(_cache_var_type ":${_cache_var_type}")
+     endif()
+-    set(_cmake_args "${_cmake_args} -D${_cache_var}${_cache_var_type}=\"${${_cache_var}}\"")
+    set(_cmake_args "${_cmake_args} -D${_cache_var}${_cache_var_type}=\"<redacted>\"")
+   endif()
+ endforeach()
+ 
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "curl",
-  "version": "8.10.1",
-  "port-version": 2,
+  "version": "8.11.0",
  "description": "A library for transferring data with URLs",
  "homepage": "https://curl.se/",
  "license": "curl AND ISC AND BSD-3-Clause",
@ -212,7 +211,7 @@
      "supports": "!uwp"
    },
    "websockets": {
-      "description": "WebSocket support (experimental)"
+      "description": "WebSocket support"
    },
    "winidn": {
      "description": "WinIDN support",
--- a/versions/a-/aliyun-oss-cpp-sdk.json
+++ b/versions/a-/aliyun-oss-cpp-sdk.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "0a3a24c8c70b6a27060c31a2be0a748bff22ef52",
+      "version": "1.10.0",
+      "port-version": 4
+    },
    {
      "git-tree": "0911047ac61bf556c75c153d23ab0169990a4f77",
      "version": "1.10.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -82,7 +82,7 @@
    },
    "aliyun-oss-cpp-sdk": {
      "baseline": "1.10.0",
-      "port-version": 3
+      "port-version": 4
    },
    "allegro5": {
      "baseline": "5.2.9.1",
@ -2133,8 +2133,8 @@
      "port-version": 8
    },
    "curl": {
-      "baseline": "8.10.1",
-      "port-version": 2
+      "baseline": "8.11.0",
+      "port-version": 0
    },
    "curlcpp": {
      "baseline": "3.1",
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "c7272ca5021fc2b6a404911e1c0055fa08992463",
+      "version": "8.11.0",
+      "port-version": 0
+    },
    {
      "git-tree": "63bb9465fa415bb6f753d47b361a41b579cf2cd3",
      "version": "8.10.1",