From 0c72420dd3ccbaddf6bb4c35bf6079698ddae3f6 Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 8 Apr 2025 00:14:20 +0300 Subject: [PATCH] [curl] Add httpsrr and ssls-export features to curl (#44800) `All feature tests passed.` --- ports/curl/portfile.cmake | 2 ++ ports/curl/vcpkg.json | 16 ++++++++++++++++ scripts/test_ports/vcpkg-ci-curl/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 68abd33b31..427bccb217 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -34,6 +34,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS gsasl CURL_USE_GSASL gnutls CURL_USE_GNUTLS rtmp USE_LIBRTMP + httpsrr USE_HTTPSRR + ssls-export USE_SSLS_EXPORT INVERTED_FEATURES ldap CURL_DISABLE_LDAP ldap CURL_DISABLE_LDAPS diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index e0317ab9d3..31955859d0 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.13.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", @@ -71,6 +72,9 @@ "nghttp2" ] }, + "httpsrr": { + "description": "enable support for HTTPS RR" + }, "idn": { "description": "Default IDN support", "dependencies": [ @@ -208,6 +212,18 @@ } ] }, + "ssls-export": { + "description": "SSL session import/export", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + } + ] + }, "sspi": { "description": "SSPI support", "supports": "windows & !uwp" diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json index 9e39dcf56f..d77869325b 100644 --- a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json @@ -50,9 +50,11 @@ "features": [ "c-ares", "http2", + "httpsrr", "idn", "rtmp", - "ssh" + "ssh", + "ssls-export" ] }, { diff --git a/versions/baseline.json b/versions/baseline.json index 1299aa8e53..6a8f4c83c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2154,7 +2154,7 @@ }, "curl": { "baseline": "8.13.0", - "port-version": 0 + "port-version": 1 }, "curlcpp": { "baseline": "3.1", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 8a494f75ab..7c85c3adf0 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0b645f9e08afb96b7d7eda9489663ffa41bf7c1", + "version": "8.13.0", + "port-version": 1 + }, { "git-tree": "242c3849525ab4b1e253b375eeb37f11898f0785", "version": "8.13.0",