diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch index 8a72f3d5cd..5ac1435877 100644 --- a/ports/curl/dependencies.patch +++ b/ports/curl/dependencies.patch @@ -10,13 +10,14 @@ index b5437e7525..14dbbb9d3f 100644 endif() if(_brotli_FOUND) -@@ -57,6 +56,13 @@ if(_brotli_FOUND) +@@ -57,6 +56,14 @@ if(_brotli_FOUND) set(_brotli_LIBRARIES "${_brotli_STATIC_LIBRARIES}") endif() message(STATUS "Found Brotli (via pkg-config): ${_brotli_INCLUDE_DIRS} (found version \"${BROTLI_VERSION}\")") +elseif(1) -+ find_package(BROTLI NAMES unofficial-brotli) -+ set(Brotli_FOUND "${BROTLI_FOUND}") ++ find_package(unofficial-brotli) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Brotli REQUIRED_VARS unofficial-brotli_CONFIG) + set(_brotli_CFLAGS "") + set(_brotli_INCLUDE_DIRS "") + set(_brotli_LIBRARY_DIRS "") @@ -45,8 +46,8 @@ index 3c05c3b2eb..b9f022cdd4 100644 endif() message(STATUS "Found Cares (via CMake Config): ${c-ares_CONFIG} (found version \"${CARES_VERSION}\")") +elseif(1) -+ set(Cares_FOUND FALSE) -+ set(CARES_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Cares REQUIRED_VARS c-ares_CONFIG) else() find_path(CARES_INCLUDE_DIR NAMES "ares.h") if(CARES_USE_STATIC_LIBS) @@ -88,8 +89,8 @@ index fff57b2c29..7d81acd99a 100644 set(GNUTLS_VERSION ${_gnutls_VERSION}) message(STATUS "Found GnuTLS (via pkg-config): ${_gnutls_INCLUDE_DIRS} (found version \"${GNUTLS_VERSION}\")") +elseif(1) -+ set(GnuTLS_FOUND FALSE) -+ set(GNUTLS_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(GnuTLS REQUIRED_VARS _gnutls_FOUND) else() find_path(GNUTLS_INCLUDE_DIR NAMES "gnutls/gnutls.h") find_library(GNUTLS_LIBRARY NAMES "gnutls" "libgnutls") @@ -106,16 +107,17 @@ diff --git a/CMake/FindLDAP.cmake b/CMake/FindLDAP.cmake index 2f5cc713c7..63c1b0800f 100644 --- a/CMake/FindLDAP.cmake +++ b/CMake/FindLDAP.cmake -@@ -49,6 +49,8 @@ if(_ldap_FOUND) +@@ -49,6 +49,9 @@ if(_ldap_FOUND) set(LDAP_FOUND TRUE) set(LDAP_VERSION ${_ldap_ldap_VERSION}) message(STATUS "Found LDAP (via pkg-config): ${_ldap_INCLUDE_DIRS} (found version \"${LDAP_VERSION}\")") +elseif(1) -+ set(LDAP_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(LDAP REQUIRED_VARS _ldap_FOUND) else() set(_ldap_pc_requires "") # Depend on pkg-config only when found via pkg-config -@@ -109,7 +111,6 @@ if(LDAP_FOUND) +@@ -109,7 +112,6 @@ if(LDAP_FOUND) INTERFACE_LIBCURL_PC_MODULES "${_ldap_pc_requires}" INTERFACE_COMPILE_OPTIONS "${_ldap_CFLAGS}" INTERFACE_INCLUDE_DIRECTORIES "${_ldap_INCLUDE_DIRS}" @@ -133,8 +135,8 @@ index 5ddf957d72..db462466e4 100644 set(LIBGSASL_FOUND TRUE) message(STATUS "Found Libgsasl (via pkg-config): ${_libgsasl_INCLUDE_DIRS} (found version \"${LIBGSASL_VERSION}\")") +elseif(1) -+ set(Libgsasl_FOUND FALSE) -+ set(LIBGSASL_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Libgsasl REQUIRED_VARS _libgsasl_FOUND) else() find_path(LIBGSASL_INCLUDE_DIR NAMES "gsasl.h") find_library(LIBGSASL_LIBRARY NAMES "gsasl" "libgsasl") @@ -156,8 +158,8 @@ index 336a7f7b40..b2f3eaf534 100644 set(LIBIDN2_VERSION ${_libidn2_VERSION}) message(STATUS "Found Libidn2 (via pkg-config): ${_libidn2_INCLUDE_DIRS} (found version \"${LIBIDN2_VERSION}\")") +elseif(1) -+ set(Libidn2_FOUND FALSE) -+ set(LIBIDN2_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Libidn2 REQUIRED_VARS _libidn2_FOUND) else() find_path(LIBIDN2_INCLUDE_DIR NAMES "idn2.h") find_library(LIBIDN2_LIBRARY NAMES "idn2" "libidn2") @@ -179,8 +181,8 @@ index 9b1a0cdd97..a7fe288883 100644 set(LIBPSL_VERSION ${_libpsl_VERSION}) message(STATUS "Found Libpsl (via pkg-config): ${_libpsl_INCLUDE_DIRS} (found version \"${LIBPSL_VERSION}\")") +elseif(1) -+ set(Libpsl_FOUND FALSE) -+ set(LIBPSL_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Libpsl REQUIRED_VARS _libpsl_FOUND _libpsl_INCLUDE_DIRS) else() find_path(LIBPSL_INCLUDE_DIR NAMES "libpsl.h") find_library(LIBPSL_LIBRARY NAMES "psl" "libpsl") @@ -214,8 +216,8 @@ index abed471eb2..f07bb0226b 100644 endif() message(STATUS "Found Libssh2 (via CMake Config): ${libssh2_CONFIG} (found version \"${LIBSSH2_VERSION}\")") +elseif(1) -+ set(Libssh2_FOUND FALSE) -+ set(LIBSSH2_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Libssh2 REQUIRED_VARS libssh2_CONFIG) else() find_path(LIBSSH2_INCLUDE_DIR NAMES "libssh2.h") if(LIBSSH2_USE_STATIC_LIBS) @@ -240,8 +242,8 @@ index 8b67ce9acf..f3c984079a 100644 list(APPEND _mbedtls_LIBRARIES MbedTLS::mbedx509 MbedTLS::mbedtls) message(STATUS "Found MbedTLS (via CMake Config): ${MbedTLS_CONFIG} (found version \"${MBEDTLS_VERSION}\")") +elseif(1) -+ set(MbedTLS_FOUND FALSE) -+ set(MBEDTLS_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(MbedTLS REQUIRED_VARS MbedTLS_CONFIG) else() set(_mbedtls_pc_requires "") # Depend on pkg-config only when found via pkg-config @@ -249,7 +251,7 @@ diff --git a/CMake/FindNGHTTP2.cmake b/CMake/FindNGHTTP2.cmake index b2a8c97ccd..8b3a1c72d3 100644 --- a/CMake/FindNGHTTP2.cmake +++ b/CMake/FindNGHTTP2.cmake -@@ -39,9 +39,10 @@ set(_nghttp2_pc_requires "libnghttp2") +@@ -39,6 +39,8 @@ set(_nghttp2_pc_requires "libnghttp2") if(NOT DEFINED NGHTTP2_INCLUDE_DIR AND NOT DEFINED NGHTTP2_LIBRARY) @@ -257,19 +259,26 @@ index b2a8c97ccd..8b3a1c72d3 100644 +if(1) if(CURL_USE_PKGCONFIG) find_package(PkgConfig QUIET) -- pkg_check_modules(_nghttp2 ${_nghttp2_pc_requires}) + pkg_check_modules(_nghttp2 ${_nghttp2_pc_requires}) +@@ -58,6 +60,9 @@ if(_nghttp2_FOUND) + set(_nghttp2_LIBRARIES "${_nghttp2_STATIC_LIBRARIES}") endif() - if(NOT _nghttp2_FOUND AND CURL_USE_CMAKECONFIG) - find_package(nghttp2 CONFIG QUIET) -@@ -67,6 +68,8 @@ elseif(nghttp2_CONFIG) - set(_nghttp2_LIBRARIES nghttp2::nghttp2) - endif() - message(STATUS "Found NGHTTP2 (via CMake Config): ${nghttp2_CONFIG} (found version \"${NGHTTP2_VERSION}\")") + message(STATUS "Found NGHTTP2 (via pkg-config): ${_nghttp2_INCLUDE_DIRS} (found version \"${NGHTTP2_VERSION}\")") +elseif(1) -+ set(NGHTTP2_FOUND FALSE) - else() - find_path(NGHTTP2_INCLUDE_DIR NAMES "nghttp2/nghttp2.h") - if(NGHTTP2_USE_STATIC_LIBS) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(NGHTTP2 REQUIRED_VARS _nghttp2_FOUND) + elseif(nghttp2_CONFIG) + set(NGHTTP2_FOUND TRUE) + set(NGHTTP2_VERSION ${nghttp2_VERSION}) +@@ -110,7 +115,6 @@ if(NGHTTP2_FOUND) + INTERFACE_LIBCURL_PC_MODULES "${_nghttp2_pc_requires}" + INTERFACE_COMPILE_OPTIONS "${_nghttp2_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${_nghttp2_INCLUDE_DIRS}" +- INTERFACE_LINK_DIRECTORIES "${_nghttp2_LIBRARY_DIRS}" +- INTERFACE_LINK_LIBRARIES "${_nghttp2_LIBRARIES}") ++ INTERFACE_LINK_LIBRARIES "${_nghttp2_LINK_LIBRARIES}") + endif() + endif() diff --git a/CMake/FindNGHTTP3.cmake b/CMake/FindNGHTTP3.cmake index 57550bffaf..b9bd85e43b 100644 --- a/CMake/FindNGHTTP3.cmake @@ -286,7 +295,7 @@ index 57550bffaf..b9bd85e43b 100644 endif() if(NOT _nghttp3_FOUND AND CURL_USE_CMAKECONFIG) find_package(nghttp3 CONFIG QUIET) -@@ -61,12 +62,14 @@ if(_nghttp3_FOUND) +@@ -61,12 +62,15 @@ if(_nghttp3_FOUND) elseif(nghttp3_CONFIG) set(NGHTTP3_FOUND TRUE) set(NGHTTP3_VERSION ${nghttp3_VERSION}) @@ -298,7 +307,8 @@ index 57550bffaf..b9bd85e43b 100644 endif() message(STATUS "Found NGHTTP3 (via CMake Config): ${nghttp3_CONFIG} (found version \"${NGHTTP3_VERSION}\")") +elseif(1) -+ set(NGHTTP3_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(NGHTTP3 REQUIRED_VARS nghttp3_CONFIG) else() find_path(NGHTTP3_INCLUDE_DIR NAMES "nghttp3/nghttp3.h") if(NGHTTP3_USE_STATIC_LIBS) @@ -306,7 +316,15 @@ diff --git a/CMake/FindNGTCP2.cmake b/CMake/FindNGTCP2.cmake index 615ee4a3c2..c2b0fd2e4d 100644 --- a/CMake/FindNGTCP2.cmake +++ b/CMake/FindNGTCP2.cmake -@@ -76,10 +76,10 @@ endif() +@@ -65,6 +65,7 @@ if(NGTCP2_FIND_COMPONENTS) + if(_ngtcp2_crypto_backend) + string(TOLOWER "ngtcp2_crypto_${_ngtcp2_crypto_backend}" _crypto_library_lower) + string(TOUPPER "ngtcp2_crypto_${_ngtcp2_crypto_backend}" _crypto_library_upper) ++ set(NGTCP2_CRYPTO_BACKEND "${_ngtcp2_crypto_backend}") + endif() + endif() + +@@ -76,10 +77,10 @@ endif() set(_tried_pkgconfig FALSE) if(NOT DEFINED NGTCP2_INCLUDE_DIR AND NOT DEFINED NGTCP2_LIBRARY) @@ -319,7 +337,7 @@ index 615ee4a3c2..c2b0fd2e4d 100644 endif() if(NOT _ngtcp2_FOUND AND CURL_USE_CMAKECONFIG) find_package(ngtcp2 CONFIG QUIET) -@@ -105,12 +105,14 @@ if(_ngtcp2_FOUND) +@@ -105,12 +105,15 @@ if(_ngtcp2_FOUND) elseif(ngtcp2_CONFIG) set(NGTCP2_FOUND TRUE) set(NGTCP2_VERSION ${ngtcp2_VERSION}) @@ -331,7 +349,8 @@ index 615ee4a3c2..c2b0fd2e4d 100644 endif() message(STATUS "Found NGTCP2 (via CMake Config): ${ngtcp2_CONFIG} (found version \"${NGTCP2_VERSION}\")") +elseif(1) -+ set(NGTCP2_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(NGTCP2 REQUIRED_VARS ngtcp2_CONFIG) else() find_path(NGTCP2_INCLUDE_DIR NAMES "ngtcp2/ngtcp2.h") if(NGTCP2_USE_STATIC_LIBS) @@ -344,8 +363,8 @@ index d22865ffad..049265bc8b 100644 set(NETTLE_VERSION ${_nettle_VERSION}) message(STATUS "Found Nettle (via pkg-config): ${_nettle_INCLUDE_DIRS} (found version \"${NETTLE_VERSION}\")") +elseif(1) -+ set(Nettle_FOUND FALSE) -+ set(NETTLE_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Nettle REQUIRED_VARS _nettle_FOUND) else() find_path(NETTLE_INCLUDE_DIR NAMES "nettle/sha2.h") find_library(NETTLE_LIBRARY NAMES "nettle") @@ -379,8 +398,8 @@ index 3a3c05f0fd..4c1b832898 100644 set(_wolfssl_LIBRARIES wolfssl::wolfssl) message(STATUS "Found WolfSSL (via CMake Config): ${wolfssl_CONFIG} (found version \"${WOLFSSL_VERSION}\")") +elseif(1) -+ set(WolfSSL_FOUND FALSE) -+ set(WOLFSSL_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(WolfSSL REQUIRED_VARS wolfssl_CONFIG) else() find_path(WOLFSSL_INCLUDE_DIR NAMES "wolfssl/ssl.h") find_library(WOLFSSL_LIBRARY NAMES "wolfssl") @@ -388,7 +407,7 @@ diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake index baf6148f0d..c75cfdf47e 100644 --- a/CMake/FindZstd.cmake +++ b/CMake/FindZstd.cmake -@@ -48,9 +48,10 @@ set(_zstd_pc_requires "libzstd") +@@ -48,12 +48,13 @@ set(_zstd_pc_requires "libzstd") if(NOT DEFINED ZSTD_INCLUDE_DIR AND NOT DEFINED ZSTD_LIBRARY) @@ -399,14 +418,18 @@ index baf6148f0d..c75cfdf47e 100644 - pkg_check_modules(_zstd ${_zstd_pc_requires}) endif() if(NOT _zstd_FOUND AND CURL_USE_CMAKECONFIG) - find_package(Zstd CONFIG QUIET) +- find_package(Zstd CONFIG QUIET) ++ find_package(Zstd NAMES zstd CONFIG QUIET) + # Skip using if older than v1.4.5 + if(Zstd_CONFIG AND + NOT TARGET zstd::libzstd_static AND @@ -85,6 +86,9 @@ elseif(Zstd_CONFIG) set(_zstd_LIBRARIES zstd::libzstd_shared) endif() message(STATUS "Found Zstd (via CMake Config): ${Zstd_CONFIG} (found version \"${ZSTD_VERSION}\")") +elseif(1) -+ set(Zstd_FOUND FALSE) -+ set(ZSTD_FOUND FALSE) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(Zstd REQUIRED_VARS Zstd_CONFIG) else() find_path(ZSTD_INCLUDE_DIR NAMES "zstd.h") if(ZSTD_USE_STATIC_LIBS) @@ -471,7 +494,20 @@ index f4e17d29b3..45947ec6c9 100644 list(APPEND _curl_libs CURL::libpsl) endif() if("@USE_LIBSSH@") -@@ -126,9 +121,7 @@ if("@USE_NGTCP2@") +@@ -114,7 +109,6 @@ if("@USE_MBEDTLS@") + list(APPEND _curl_libs CURL::mbedtls) + endif() + if("@USE_NGHTTP2@") +- find_dependency(NGHTTP2 MODULE) + list(APPEND _curl_libs CURL::nghttp2) + endif() + if("@USE_NGHTTP3@") +@@ -122,13 +116,11 @@ if("@USE_NGHTTP3@") + list(APPEND _curl_libs CURL::nghttp3) + endif() + if("@USE_NGTCP2@") +- find_dependency(NGTCP2 MODULE) ++ find_dependency(NGTCP2 MODULE COMPONENTS @NGTCP2_CRYPTO_BACKEND@) list(APPEND _curl_libs CURL::ngtcp2) endif() if("@USE_GNUTLS@") @@ -481,7 +517,7 @@ index f4e17d29b3..45947ec6c9 100644 list(APPEND _curl_libs CURL::nettle) endif() if("@USE_QUICHE@") -@@ -167,6 +160,7 @@ endif() +@@ -167,6 +159,7 @@ endif() set(CURL_VERSION_STRING "@CURLVERSION@") set(CURL_LIBRARIES @PROJECT_NAME@::@LIB_NAME@) set(CURL_LIBRARIES_PRIVATE "@LIBCURL_PC_LIBS_PRIVATE_LIST@") diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 2ca6562932..73f5aece46 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -15,26 +15,31 @@ vcpkg_replace_string("${SOURCE_PATH}/include/curl/curlver.h" [[LIBCURL_TIMESTAMP vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - http2 USE_NGHTTP2 - http3 USE_NGTCP2 - wolfssl CURL_USE_WOLFSSL - openssl CURL_USE_OPENSSL - openssl CURL_CA_FALLBACK - mbedtls CURL_USE_MBEDTLS - ssh CURL_USE_LIBSSH2 - tool BUILD_CURL_EXE - c-ares ENABLE_ARES - sspi CURL_WINDOWS_SSPI brotli CURL_BROTLI - idn2 USE_LIBIDN2 - winidn USE_WIN32_IDN - zstd CURL_ZSTD - psl CURL_USE_LIBPSL - gssapi CURL_USE_GSSAPI - gsasl CURL_USE_GSASL + c-ares ENABLE_ARES gnutls CURL_USE_GNUTLS + gsasl CURL_USE_GSASL + gssapi CURL_USE_GSSAPI + gssapi VCPKG_LOCK_FIND_PACKAGE_GSS + http2 USE_NGHTTP2 + http2 VCPKG_LOCK_FIND_PACKAGE_NGHTTP2 + http3 USE_NGTCP2 httpsrr USE_HTTPSRR + idn2 USE_LIBIDN2 + idn2 VCPKG_LOCK_FIND_PACKAGE_Libidn2 + ldap VCPKG_LOCK_FIND_PACKAGE_LDAP + mbedtls CURL_USE_MBEDTLS + openssl CURL_CA_FALLBACK + openssl CURL_USE_OPENSSL + psl CURL_USE_LIBPSL + ssh CURL_USE_LIBSSH2 + ssh VCPKG_LOCK_FIND_PACKAGE_Libssh2 ssls-export USE_SSLS_EXPORT + sspi CURL_WINDOWS_SSPI + tool BUILD_CURL_EXE + winidn USE_WIN32_IDN + wolfssl CURL_USE_WOLFSSL + zstd CURL_ZSTD INVERTED_FEATURES ldap CURL_DISABLE_LDAP ldap CURL_DISABLE_LDAPS @@ -44,8 +49,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if("ssl" IN_LIST FEATURES AND NOT "http3" IN_LIST FEATURES AND - # (windows & !uwp) | mingw to match curl[ssl]'s "platform" - ((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_MINGW)) + # Match curl[ssl]'s "platform": "windows & !uwp" + (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)) list(APPEND FEATURE_OPTIONS -DCURL_USE_SCHANNEL=ON) endif() @@ -72,12 +77,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_find_acquire_program(PKGCONFIG) +set(ENV{PKG_CONFIG} "${PKGCONFIG}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" - "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ${FEATURE_OPTIONS} ${OPTIONS} -DBUILD_TESTING=OFF @@ -88,15 +93,14 @@ vcpkg_cmake_configure( -DCURL_USE_PKGCONFIG=ON -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON MAYBE_UNUSED_VARIABLES - PKG_CONFIG_EXECUTABLE + VCPKG_LOCK_FIND_PACKAGE_GSS + VCPKG_LOCK_FIND_PACKAGE_LDAP + VCPKG_LOCK_FIND_PACKAGE_Libidn2 + VCPKG_LOCK_FIND_PACKAGE_Libssh2 + VCPKG_LOCK_FIND_PACKAGE_NGHTTP2 ) vcpkg_cmake_install() vcpkg_copy_pdbs() - -if ("tool" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN) -endif() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CURL) vcpkg_fixup_pkgconfig() @@ -109,7 +113,10 @@ if(NOT DEFINED VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libcurl.pc" " -lcurl" " -l${namespec}-d") endif() -#Fix install path +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN) +endif() + 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)]=]) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index c1c628085b..1f06089d9a 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.20.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", @@ -182,15 +183,6 @@ "ssl": { "description": "Default SSL / TLS implementation.", "dependencies": [ - { - "$comment": "Defaults to schannel on Windows, unless http3 is also enabled", - "name": "curl", - "default-features": false, - "features": [ - "sspi" - ], - "platform": "(windows & !uwp) | mingw" - }, { "$comment": "Otherwise, defaults to OpenSSL.", "name": "curl", @@ -198,7 +190,16 @@ "features": [ "openssl" ], - "platform": "(uwp | !windows) & !mingw" + "platform": "uwp | !windows" + }, + { + "$comment": "Defaults to schannel on Windows, unless http3 is also enabled", + "name": "curl", + "default-features": false, + "features": [ + "sspi" + ], + "platform": "windows & !uwp" } ] }, @@ -216,31 +217,28 @@ }, "sspi": { "description": "SSPI support", - "supports": "(windows & !uwp) | mingw" + "supports": "windows & !uwp" }, "tool": { "description": "Builds curl executable", "supports": "!uwp" }, "websockets": { - "description": "WebSocket support" - }, - "winidn": { - "description": "WinIDN support", - "supports": "windows" - }, - "winldap": { - "description": "Obsolete. Use feature 'ldap' instead.", + "description": "WebSocket support", "dependencies": [ { "name": "curl", "default-features": false, "features": [ - "ldap" + "non-http" ] } ] }, + "winidn": { + "description": "WinIDN support", + "supports": "windows" + }, "wolfssl": { "description": "SSL support (wolfSSL)", "dependencies": [ diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json index 6cf751555b..240532f78c 100644 --- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json @@ -16,8 +16,15 @@ ], "default-features": [ "compression", + { + "name": "http3", + "platform": "arm & linux" + }, "misc", - "security" + { + "name": "security", + "platform": "!(arm & linux)" + } ], "features": { "compression": { @@ -41,6 +48,18 @@ } ] }, + "http3": { + "description": "HTTP3 (needs single-backend security)", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "http3" + ] + } + ] + }, "misc": { "description": "Misc features", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 075fa6ca5c..dad32ec3a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2282,7 +2282,7 @@ }, "curl": { "baseline": "8.20.0", - "port-version": 0 + "port-version": 1 }, "curlcpp": { "baseline": "3.1", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 9a7176717c..9fc38e8d86 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94fb76b63c2f0251b57301ba9842ebe9ff2b6164", + "version": "8.20.0", + "port-version": 1 + }, { "git-tree": "23da3e78d5841cd406fee1fc4bb1d4effba0ff44", "version": "8.20.0",