Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[curl] Update to 8.0.1 #30363

Merged
merged 4 commits into from Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions ports/curl/portfile.cmake
@@ -1,8 +1,9 @@
string(REPLACE "." "_" curl_version "curl-${VERSION}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF curl-7_88_1
SHA512 c5caa1f95580ddbf2041c9c4b885f84d4f5c5fcb905a5ea59f9dbb58a98fc292260f95cb935e963bf83d7dcecf98561deef5ce3ff91cdcb29a080559cff0ed64
REF ${curl_version}
SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569
HEAD_REF master
PATCHES
0002_fix_uwp.patch
Expand All @@ -13,6 +14,7 @@ vcpkg_from_github(
mbedtls-ws2_32.patch
export-components.patch
0023-fix-find-cares.patch
version-major-7-8.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
3 changes: 1 addition & 2 deletions ports/curl/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "curl",
"version": "7.88.1",
"port-version": 1,
"version": "8.0.1",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": null,
Expand Down
20 changes: 20 additions & 0 deletions ports/curl/version-major-7-8.patch
@@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed60f07bc..270a562d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1609,6 +1609,15 @@ write_basic_package_version_file(
VERSION ${CURL_VERSION}
COMPATIBILITY SameMajorVersion
)
+file(READ "${version_config}" generated_version_config)
+file(WRITE "${version_config}" "
+if(NOT PACKAGE_FIND_VERSION_RANGE AND PACKAGE_FIND_VERSION_MAJOR STREQUAL \"7\")
+ # Version 8 satisfies version 7... requirements
+ set(PACKAGE_FIND_VERSION_MAJOR 8)
+ set(PACKAGE_FIND_VERSION_COUNT 1)
+endif()
+${generated_version_config}"
+)

# Use:
# * TARGETS_EXPORT_NAME
4 changes: 2 additions & 2 deletions versions/baseline.json
Expand Up @@ -1901,8 +1901,8 @@
"port-version": 8
},
"curl": {
"baseline": "7.88.1",
"port-version": 1
"baseline": "8.0.1",
"port-version": 0
},
"curlpp": {
"baseline": "2018-06-15",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/curl.json
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f",
"version": "8.0.1",
"port-version": 0
},
{
"git-tree": "9be28a8022b91c14e868d88a74eedc0dd891e966",
"version": "7.88.1",
Expand Down