GH-19: curl/8.8.0

negrutiu · May 29, 2024 · 6f5677d · 6f5677d
1 parent 8c948de
commit 6f5677d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 26 deletions.
diff --git a/vcpkg_overlay_ports/curl/dependencies.patch b/vcpkg_overlay_ports/curl/dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in
-index 056907c..c89c686 100644
+index 9adb96e0a..a013adf7a 100644
 --- a/CMake/curl-config.cmake.in
 +++ b/CMake/curl-config.cmake.in
 @@ -31,6 +31,16 @@ if(@USE_ZLIB@)
@@ -20,7 +20,7 @@ index 056907c..c89c686 100644
  check_required_components("@PROJECT_NAME@")
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 049ac34..cc0fe19 100644
+index 656aa7c74..90a7c1371 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -163,7 +163,8 @@ set(CURL_LIBS "")
@@ -74,16 +74,16 @@ index 049ac34..cc0fe19 100644
    if(LIBSSH2_FOUND)
      list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY})
      list(APPEND CMAKE_REQUIRED_INCLUDES "${LIBSSH2_INCLUDE_DIR}")
-@@ -917,6 +917,14 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is sup
+@@ -917,6 +925,14 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is sup
  mark_as_advanced(CURL_USE_GSSAPI)
 
  if(CURL_USE_GSSAPI)
 +  find_package(PkgConfig REQUIRED)
 +  pkg_check_modules(KRB5 REQUIRED krb5 krb5-gssapi)
 +  list(APPEND CURL_LIBS ${KRB5_LINK_LIBRARIES} resolv)
-+  set(HAVE_GSSAPI_GSSAPI_H ON)
-+  set(HAVE_GSSAPI_GSSAPI_GENERIC_H ON)
-+  set(HAVE_GSSAPI_GSSAPI_KRB5_H ON)
++  check_include_file_concat("gssapi/gssapi.h"  HAVE_GSSAPI_GSSAPI_H)
++  check_include_file_concat("gssapi/gssapi_generic.h" HAVE_GSSAPI_GSSAPI_GENERIC_H)
++  check_include_file_concat("gssapi/gssapi_krb5.h" HAVE_GSSAPI_GSSAPI_KRB5_H)
 +  set(HAVE_GSSAPI ON)
 +  elseif(0)
    find_package(GSS)

diff --git a/vcpkg_overlay_ports/curl/nscurl/curl_ftruncate.patch b/vcpkg_overlay_ports/curl/nscurl/curl_ftruncate.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1245,3 +1245,3 @@
+@@ -1310,3 +1310,3 @@
  check_symbol_exists(pipe           "${CURL_INCLUDES}" HAVE_PIPE)
 -check_symbol_exists(ftruncate      "${CURL_INCLUDES}" HAVE_FTRUNCATE)
-+# check_symbol_exists(ftruncate      "${CURL_INCLUDES}" HAVE_FTRUNCATE)     # nscurl: The mingw-x64 implementation of ftruncate() calls FindFirstVolume/FindNextVolume/GetFileSizeEx, unavailable in NT4
- check_symbol_exists(fseeko         "${CURL_INCLUDES};stdio.h" HAVE_FSEEKO)
++# check_symbol_exists(ftruncate    "${CURL_INCLUDES}" HAVE_FTRUNCATE)     # nscurl: The mingw-x64 implementation of ftruncate() calls FindFirstVolume/FindNextVolume/GetFileSizeEx, unavailable in NT4
+ check_symbol_exists(_fseeki64      "${CURL_INCLUDES};stdio.h" HAVE__FSEEKI64)
diff --git a/vcpkg_overlay_ports/curl/portfile.cmake b/vcpkg_overlay_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}"
         nscurl/curl_ftruncate.patch         # nscurl: mingw-x64 implementation of ftruncate() calls FindFirstVolume/FindNextVolume/GetFileSizeEx, unavailable in NT4
         nscurl/curl_toolhelp.diff           # nscurl: no Tool Help calls (i.e. CreateToolhelp32Snapshot). inexistent in NT4, unneeded by nscurl
         nscurl/curl_wspiapi.diff            # nscurl: fix linking to Ws2_32!getaddrinfo and Ws2_32!freeaddrinfo when _WIN32_WINNT <= 0x0500
@@ -65,11 +56,6 @@ if("openssl" IN_LIST FEATURES)
     list(APPEND OPTIONS -DCURL_USE_SCHANNEL=OFF)
 endif()
 
-if("idn2" 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)
 endif()
@@ -87,10 +73,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/vcpkg_overlay_ports/curl/vcpkg.json b/vcpkg_overlay_ports/curl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "curl",
-  "version": "8.7.1",
-  "port-version": 3,
+  "version": "8.8.0",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",
@@ -35,6 +34,7 @@
     },
     "gssapi": {
       "description": "krb5 support",
+      "supports": "!windows",
       "dependencies": [
         "krb5"
       ]