diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index 723745535f..d41c9d0257 100644 --- 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 c4ba74d..8a52c2a 100644 +index 0cba6f6..851efaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2089,7 +2089,9 @@ if(NOT CURL_DISABLE_INSTALL) +@@ -2129,7 +2129,9 @@ if(NOT CURL_DISABLE_INSTALL) set(_implicit_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES}) endif() -- foreach(_lib IN LISTS _implicit_libs CURL_LIBS) +- foreach(_lib IN LISTS _implicit_libs _custom_libs CURL_LIBS) + set(CURL_LIBS_FLAT "") + vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) + foreach(_lib IN LISTS CURL_LIBS_FLAT) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 841bd7e0f0..f8f3aced53 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -4,10 +4,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl REF ${curl_version} - SHA512 d18f453b6ee683a13828ef746cb8d3639f96c759a082736602d7cadaea9dc51bd9b095e5f663aeb9429c2063be3783a24f642ccdb9495b0e0942c501b186322e + SHA512 ab54562a70209da20fa3d797029dc7022a37b7c501e50250503721251cbf209938fb37ffc1dc9d82c451b1da1b76c79f35c53953b029b5b000903db98aee5840 HEAD_REF master PATCHES - redact-input-vars.diff 0005_remove_imp_suffix.patch 0020-fix-pc-file.patch 0022-deduplicate-libs.patch diff --git a/ports/curl/redact-input-vars.diff b/ports/curl/redact-input-vars.diff deleted file mode 100644 index b3f2e53c66..0000000000 --- a/ports/curl/redact-input-vars.diff +++ /dev/null @@ -1,13 +0,0 @@ -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}=\"\"") - endif() - endforeach() - diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 5fa5e1cf4d..f6a5187aec 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "curl", - "version": "8.11.0", - "port-version": 1, + "version": "8.11.1", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4cdc9e5b4c..ffbeb7d801 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2145,8 +2145,8 @@ "port-version": 8 }, "curl": { - "baseline": "8.11.0", - "port-version": 1 + "baseline": "8.11.1", + "port-version": 0 }, "curlcpp": { "baseline": "3.1", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 32e752294f..7a91dd2320 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aae0f4f9dd2f724e673c0d458fc4531626864393", + "version": "8.11.1", + "port-version": 0 + }, { "git-tree": "6ef1763f3cbe570d6378632c9b5793479c37fb07", "version": "8.11.0",