From 1921ac8524ac6a4c1acb4594fa2426bfeb1aeb1b Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 29 Mar 2024 06:59:27 +0100
Subject: [PATCH] [curl] Update to 8.7.1 (#37751)

---
 ports/curl/0020-fix-pc-file.patch | 10 +++++-----
 ports/curl/portfile.cmake         | 12 +++++++++++-
 ports/curl/vcpkg.json             |  3 +--
 versions/baseline.json            |  4 ++--
 versions/c-/curl.json             |  5 +++++
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch
index 8031121c6a..4a108b3b78 100644
--- a/ports/curl/0020-fix-pc-file.patch
+++ b/ports/curl/0020-fix-pc-file.patch
@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b83a7f..0ceaf5b 100644
+index 3a2128e..e9c9c92 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1652,7 +1652,9 @@ if(NOT CURL_DISABLE_INSTALL)
-   set(LDFLAGS                 "${CMAKE_SHARED_LINKER_FLAGS}")
-   set(LIBCURL_LIBS            "")
-   set(libdir                  "${CMAKE_INSTALL_PREFIX}/lib")
+@@ -1662,7 +1662,9 @@ if(NOT CURL_DISABLE_INSTALL)
+     endif()
+   endforeach()
+ 
 -  foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
 +  set(CURL_LIBS_FLAT "")
 +  vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index fe3cd4beb5..0c21a34105 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -1,9 +1,18 @@
 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 ee9f6c3b5468ab547fc20822c18756a625f9f741e3d40958548a56b607f567f4ed782b8cce2d900c442e0da51faa8cb1fefa5d9f2d1581c79805a5b8fd4ec098
+    SHA512 38a1f7d7f5c83922cd4e0a858ac803d230d691c8f4df7e5086062c6991da740e626aa86675683282bc8555fc4cb962a08ba1a7ce817d78961d749d6d580fb9fa
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch
@@ -15,6 +24,7 @@ vcpkg_from_github(
         export-components.patch
         dependencies.patch
         cmake-config.patch
+        "${COMPRESSION_FIX}"
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 00d693476c..5077ae24b1 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "curl",
-  "version": "8.6.0",
-  "port-version": 1,
+  "version": "8.7.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 c290fb471d..5fa2c50089 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2069,8 +2069,8 @@
       "port-version": 8
     },
     "curl": {
-      "baseline": "8.6.0",
-      "port-version": 1
+      "baseline": "8.7.1",
+      "port-version": 0
     },
     "curlpp": {
       "baseline": "2018-06-15",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index fa17b055bd..938f88faaa 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f3aa7f4fd142a1c5822e4f36e0a4c45c031134a",
+      "version": "8.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "1e5908adb574672dfc7a65baa8523ae184f5c0b7",
       "version": "8.6.0",