From eb445dc7d9cd7f90a9df1279b13df3c389260629 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 25 May 2024 04:19:10 +0200
Subject: [PATCH] [curl] Update to 8.8.0 (#38862)

Resolves #38869.

For simplicity, always acquire `PKGCONFIG`:
It is needed by multiple features, and on `UNIX`, curl's find modules
will try to load it for determining package hints.
---
 ports/curl/portfile.cmake | 18 ++++--------------
 ports/curl/vcpkg.json     |  3 +--
 versions/baseline.json    |  4 ++--
 versions/c-/curl.json     |  5 +++++
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 03938012d2..34b0e8c65d 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -1,18 +1,10 @@
 string(REPLACE "." "_" curl_version "curl-${VERSION}")
 
-# Fix for HTTP compression introduced in 8.7.1; should be fixed the following release
-vcpkg_download_distfile(
-    COMPRESSION_FIX
-    URLS https://github.com/curl/curl/commit/b30d694a027eb771c02a3db0dee0ca03ccab7377.patch?full_index=1
-    FILENAME curl-compression-fix-b30d694a027eb771c02a3db0dee0ca03ccab7377.patch
-    SHA512 2658826a7331adb86cd7cd692dac6c7bf79bbd9c76c11780f33b1143b6d04edfe64223356701343c31209261decffc883ddba061d5370d7872a81f2a18780c33
-)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
     REF "${curl_version}"
-    SHA512 38a1f7d7f5c83922cd4e0a858ac803d230d691c8f4df7e5086062c6991da740e626aa86675683282bc8555fc4cb962a08ba1a7ce817d78961d749d6d580fb9fa
+    SHA512 e66cbf9bd3ae7b9b031475210b80b883b6a133042fbbc7cf2413f399d1b38aa54ab7322626abd3c6f1af56e0d540221f618aa903bd6b463ac8324f2c4e92dfa8
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch
@@ -24,7 +16,6 @@ vcpkg_from_github(
         export-components.patch
         dependencies.patch
         cmake-config.patch
-        "${COMPRESSION_FIX}"
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -54,10 +45,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 set(OPTIONS "")
-if(("idn2" IN_LIST FEATURES) OR ("gssapi" IN_LIST FEATURES) OR ("ldap" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS))
-    vcpkg_find_acquire_program(PKGCONFIG)
-    list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}")
-endif()
 
 if("sectransp" IN_LIST FEATURES)
     list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none)
@@ -76,10 +63,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND OPTIONS -DENABLE_UNICODE=ON)
 endif()
 
+vcpkg_find_acquire_program(PKGCONFIG)
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
+        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
         ${FEATURE_OPTIONS}
         ${OPTIONS}
         -DBUILD_TESTING=OFF
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 661babd224..45619d6530 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "curl",
-  "version": "8.7.1",
-  "port-version": 4,
+  "version": "8.8.0",
   "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 6aaab704f0..fc23a0d898 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2089,8 +2089,8 @@
       "port-version": 8
     },
     "curl": {
-      "baseline": "8.7.1",
-      "port-version": 4
+      "baseline": "8.8.0",
+      "port-version": 0
     },
     "curlpp": {
       "baseline": "2018-06-15",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index 8d8df2ce94..ae19d5b698 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4644cbe68d83d9778be65efb28cee3a3e0e4f46",
+      "version": "8.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e6772f7da4a8824fd967ec448a3c1f8ca3b8b53b",
       "version": "8.7.1",