diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 5aa451bf401d91..c1572624a3775f 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -13,16 +13,4 @@ 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/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index c83a196520a56c..83ec1051336796 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -9,5 +9,6 @@ index 1d71e14..62b7b33 100644 -if(WIN32) +if(WIN32 AND 0) if(BUILD_SHARED_LIBS) - # Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib" - set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") + if(MSVC) + # Add "_imp" as a suffix before the extension to avoid conflicting with + # the statically linked "libcurl.lib" diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch deleted file mode 100644 index 19d5b12307d36f..00000000000000 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc7223b..a661cb8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -620,9 +620,6 @@ if(NOT CURL_DISABLE_LDAPS) - check_include_file_concat("ldapssl.h" HAVE_LDAPSSL_H) - endif() - --# Check for idn --check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) -- - # Check for symbol dlopen (same as HAVE_LIBDL) - check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) - -@@ -870,6 +867,20 @@ if(CURL_CA_PATH_SET AND NOT USE_OPENSSL AND NOT USE_MBEDTLS) - "Set CURL_CA_PATH=none or enable one of those TLS backends.") - endif() - -+if (CMAKE_USE_IDN2) -+ include(FindPackageHandleStandardArgs) -+ include(SelectLibraryConfigurations) -+ -+ find_path(LIBIDN2_INCLUDE_DIRS idn2.h) -+ find_library(LIBIDN2_LIBRARY_DEBUG NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib NO_DEFAULT_PATH Release RelWithDebInfo MinSizeRel) -+ find_library(LIBIDN2_LIBRARY_RELEASE NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib NO_DEFAULT_PATH Debug) -+ select_library_configurations(LIBIDN2) -+ -+ add_definitions(-DHAVE_IDN2_H -DHAVE_LIBIDN2) -+ include_directories(${LIBIDN2_INCLUDE_DIRS}) -+ link_libraries(${LIBIDN2_LIBRARY}) -+endif() -+ - # Check for header files - if(NOT UNIX) - check_include_file_concat("windows.h" HAVE_WINDOWS_H) -@@ -906,7 +917,6 @@ check_include_file_concat("crypto.h" HAVE_CRYPTO_H) - check_include_file_concat("err.h" HAVE_ERR_H) - check_include_file_concat("errno.h" HAVE_ERRNO_H) - check_include_file_concat("fcntl.h" HAVE_FCNTL_H) --check_include_file_concat("idn2.h" HAVE_IDN2_H) - check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) - check_include_file_concat("io.h" HAVE_IO_H) - check_include_file_concat("krb.h" HAVE_KRB_H) -@@ -1362,7 +1372,6 @@ _add_if("libz" HAVE_LIBZ) - _add_if("brotli" HAVE_BROTLI) - _add_if("zstd" HAVE_ZSTD) - _add_if("AsynchDNS" USE_ARES OR USE_THREADS_POSIX OR USE_THREADS_WIN32) --_add_if("IDN" HAVE_LIBIDN2) - _add_if("Largefile" (CURL_SIZEOF_CURL_OFF_T GREATER 4) AND - ((SIZEOF_OFF_T GREATER 4) OR USE_WIN32_LARGE_FILES)) - # TODO SSP1 (Schannel) check is missing diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 21e813ab089cf1..5fd79b1d6fdaff 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 e052859759b34d0e05ce0f17244873e5cd7b457b #curl-7_74_0 - SHA512 3dbbab00dda4f0e7d012fab358d2dd1362ff0c0f59c81f638fb547acba6f74a61c306906892447af3b18e8b0ebb93ebb8e0ac77e92247864bfa3a9c4ce7ea1d0 + REF 6b951a6928811507d493303b2878e848c077b471 #curl-7_77_0 + SHA512 47390ae10116af6697aae1d2e8b517ba478e3ab5a036df0c46653cfba571b21086bf33887768ea7a0764a5ff7c5ba6a303856c55c1b6978d17ef8d39f3bb80f1 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -12,7 +12,6 @@ vcpkg_from_github( 0007_disable_tool_export_curl_target.patch 0010_fix_othertests_cmake.patch 0011_fix_static_build.patch - 0012-fix-dependency-idn2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) @@ -41,7 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS brotli CURL_BROTLI schannel CMAKE_USE_SCHANNEL sectransp CMAKE_USE_SECTRANSP - idn2 CMAKE_USE_IDN2 + idn2 USE_LIBIDN2 INVERTED_FEATURES non-http HTTP_ONLY diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index e34124382f58dc..f77ac475ade2f5 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "curl", - "version": "7.74.0", - "port-version": 6, + "version": "7.77.0", "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 61b29fa2182b8d..583addc74e8963 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1545,8 +1545,8 @@ "port-version": 0 }, "curl": { - "baseline": "7.74.0", - "port-version": 6 + "baseline": "7.77.0", + "port-version": 0 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index e80c018a8e3624..30fe425155cd42 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "866e7fee114e127619cf40aff460cf2dd2711120", + "version": "7.77.0", + "port-version": 0 + }, + { + "git-tree": "194cb2106d4bb14b6ec9be32af72ab519a017aac", + "version": "7.75.0", + "port-version": 0 + }, { "git-tree": "73eb56fb6fa870b5959ba36b931817fc85208efe", "version": "7.74.0",