[curl] Update (#31710)

microsoft · Jun 1, 2023 · d8e5ba9 · d8e5ba9
1 parent 69f86f8
commit d8e5ba9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 30 deletions.
diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch
@@ -1,12 +1,12 @@
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 1d71e14..62b7b33 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 1d71e14..62b7b33 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
 @@ -125,7 +125,6 @@ if(WIN32)
      if(MSVC)
        # Add "_imp" as a suffix before the extension to avoid conflicting with
        # the statically linked "libcurl.lib"
 -      set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib")
      endif()
    endif()
- endif()
+ elseif(NOT CMAKE_CROSSCOMPILING)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
@@ -2,8 +2,8 @@ string(REPLACE "." "_" curl_version "curl-${VERSION}")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF ${curl_version}
-    SHA512 4a7aa0091ac1e0f1d4366277d585c19bd9ad786fa49329a96d43eb6aebd1b366c1c2144436c243686d9ad430e7d3f4137ea0764c7759198f0eb29107a5d86569
+    REF "${curl_version}"
+    SHA512 d3c0bd113c772249c7e4e83cc26c6e2a1ff5644486c96318de6ab035300c52aca10756af665d91c5ce71f9d4afa4afbf7fbb756e9e4c800869b50c8a653bd519
     HEAD_REF master
     PATCHES
         0002_fix_uwp.patch
@@ -14,7 +14,6 @@ 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
@@ -73,6 +72,7 @@ vcpkg_cmake_configure(
         -DENABLE_MANUAL=OFF
         -DCURL_CA_FALLBACK=ON
         -DCURL_USE_LIBPSL=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
     OPTIONS_DEBUG
         -DENABLE_DEBUG=ON
 )

diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "curl",
-  "version": "8.0.1",
+  "version": "8.1.2",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": null,

diff --git a/ports/curl/version-major-7-8.patch b/ports/curl/version-major-7-8.patch
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1941,7 +1941,7 @@
       "port-version": 8
     },
     "curl": {
-      "baseline": "8.0.1",
+      "baseline": "8.1.2",
       "port-version": 0
     },
     "curlpp": {

diff --git a/versions/c-/curl.json b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b70ded19f70e4b198d8c3f844324c7884d3faa7d",
+      "version": "8.1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "08eea1b0a159f6555603ac8d26a9f8ab4738d02f",
       "version": "8.0.1",