Merge pull request #44 from negrutiu/feature/curl-8-12-1

curl/8.12.1

Author: negrutiu

vcpkg/overlay_ports/curl/dependencies.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d55cef4..cb97dd5 100644
+index 86add74..be7b193 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -345,7 +345,7 @@ set(LIBCURL_PC_REQUIRES_PRIVATE "")
@@ -11,7 +11,7 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${CARES_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${CARES_PC_REQUIRES})
    link_directories(${CARES_LIBRARY_DIRS})
-@@ -787,7 +787,7 @@ if(CURL_USE_MBEDTLS)
+@@ -789,7 +789,7 @@ if(CURL_USE_MBEDTLS)
    find_package(MbedTLS REQUIRED)
    set(_ssl_enabled ON)
    set(USE_MBEDTLS ON)
@@ -20,7 +20,7 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${MBEDTLS_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${MBEDTLS_PC_REQUIRES})
    include_directories(SYSTEM ${MBEDTLS_INCLUDE_DIRS})
-@@ -821,7 +821,7 @@ if(CURL_USE_WOLFSSL)
+@@ -823,7 +823,7 @@ if(CURL_USE_WOLFSSL)
    find_package(WolfSSL REQUIRED)
    set(_ssl_enabled ON)
    set(USE_WOLFSSL ON)
@@ -29,16 +29,16 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${WOLFSSL_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${WOLFSSL_PC_REQUIRES})
    include_directories(SYSTEM ${WOLFSSL_INCLUDE_DIRS})
-@@ -850,7 +850,7 @@ if(CURL_USE_GNUTLS)
+@@ -856,7 +856,7 @@ if(CURL_USE_GNUTLS)
    find_package(Nettle REQUIRED)
    set(_ssl_enabled ON)
    set(USE_GNUTLS ON)
 -  list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES} ${NETTLE_LIBRARIES})
 +  list(APPEND CURL_LIBS ${GNUTLS_LINK_LIBRARIES} ${NETTLE_LINK_LIBRARIES})
-   list(APPEND CURL_LIBDIRS ${NETTLE_LIBRARY_DIRS})
+   list(APPEND CURL_LIBDIRS ${GNUTLS_LIBRARY_DIRS} ${NETTLE_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "gnutls" ${NETTLE_PC_REQUIRES})
    include_directories(SYSTEM ${GNUTLS_INCLUDE_DIRS} ${NETTLE_INCLUDE_DIRS})
-@@ -913,7 +913,7 @@ set(HAVE_BROTLI OFF)
+@@ -919,7 +919,7 @@ set(HAVE_BROTLI OFF)
  curl_dependency_option(CURL_BROTLI Brotli "brotli")
  if(BROTLI_FOUND)
    set(HAVE_BROTLI ON)
@@ -47,7 +47,7 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${BROTLI_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${BROTLI_PC_REQUIRES})
    include_directories(SYSTEM ${BROTLI_INCLUDE_DIRS})
-@@ -928,7 +928,7 @@ curl_dependency_option(CURL_ZSTD Zstd "zstd")
+@@ -934,7 +934,7 @@ curl_dependency_option(CURL_ZSTD Zstd "zstd")
  if(ZSTD_FOUND)
    if(NOT ZSTD_VERSION VERSION_LESS 1.0.0)
      set(HAVE_ZSTD ON)
@@ -56,7 +56,7 @@ index d55cef4..cb97dd5 100644
      list(APPEND CURL_LIBDIRS ${ZSTD_LIBRARY_DIRS})
      list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${ZSTD_PC_REQUIRES})
      include_directories(SYSTEM ${ZSTD_INCLUDE_DIRS})
-@@ -1047,7 +1047,7 @@ option(USE_NGHTTP2 "Use nghttp2 library" ON)
+@@ -1052,7 +1052,7 @@ option(USE_NGHTTP2 "Use nghttp2 library" ON)
  if(USE_NGHTTP2)
    find_package(NGHTTP2)
    if(NGHTTP2_FOUND)
@@ -65,7 +65,7 @@ index d55cef4..cb97dd5 100644
      list(APPEND CURL_LIBDIRS ${NGHTTP2_LIBRARY_DIRS})
      list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGHTTP2_PC_REQUIRES})
      include_directories(SYSTEM ${NGHTTP2_INCLUDE_DIRS})
-@@ -1079,7 +1079,7 @@ if(USE_NGTCP2)
+@@ -1084,7 +1084,7 @@ if(USE_NGTCP2)
    else()
      message(FATAL_ERROR "ngtcp2 requires OpenSSL, wolfSSL or GnuTLS")
    endif()
@@ -74,7 +74,7 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${NGTCP2_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGTCP2_PC_REQUIRES})
    include_directories(SYSTEM ${NGTCP2_INCLUDE_DIRS})
-@@ -1090,7 +1090,7 @@ if(USE_NGTCP2)
+@@ -1095,7 +1095,7 @@ if(USE_NGTCP2)
 
    find_package(NGHTTP3 REQUIRED)
    set(USE_NGHTTP3 ON)
@@ -83,25 +83,25 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${NGHTTP3_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${NGHTTP3_PC_REQUIRES})
    include_directories(SYSTEM ${NGHTTP3_INCLUDE_DIRS})
-@@ -1191,7 +1191,7 @@ if(NOT CURL_DISABLE_LDAP)
+@@ -1196,7 +1196,7 @@ if(NOT CURL_DISABLE_LDAP)
      find_package(LDAP)
      if(LDAP_FOUND)
        set(HAVE_LBER_H 1)
--      set(CURL_LIBS "${LDAP_LIBRARIES};${CURL_LIBS}")
-+      set(CURL_LIBS "${LDAP_LINK_LIBRARIES};${CURL_LIBS}")
+-      set(CURL_LIBS ${LDAP_LIBRARIES} ${CURL_LIBS})
++      list(PREPEND CURL_LIBS ${LDAP_LINK_LIBRARIES})
        list(APPEND CURL_LIBDIRS ${LDAP_LIBRARY_DIRS})
        if(LDAP_PC_REQUIRES)
-         set(LIBCURL_PC_REQUIRES_PRIVATE "${LDAP_PC_REQUIRES};${LIBCURL_PC_REQUIRES_PRIVATE}")
-@@ -1269,7 +1269,7 @@ set(HAVE_LIBIDN2 OFF)
+         set(LIBCURL_PC_REQUIRES_PRIVATE ${LDAP_PC_REQUIRES} ${LIBCURL_PC_REQUIRES_PRIVATE})
+@@ -1273,7 +1273,7 @@ set(HAVE_LIBIDN2 OFF)
  if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
    find_package(Libidn2)
    if(LIBIDN2_FOUND)
--    set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}")
-+    set(CURL_LIBS "${LIBIDN2_LINK_LIBRARIES};${CURL_LIBS}")
+-    set(CURL_LIBS ${LIBIDN2_LIBRARIES} ${CURL_LIBS})
++    list(PREPEND CURL_LIBS ${LIBIDN2_LINK_LIBRARIES})
      list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})
-     set(LIBCURL_PC_REQUIRES_PRIVATE "${LIBIDN2_PC_REQUIRES};${LIBCURL_PC_REQUIRES_PRIVATE}")
+     set(LIBCURL_PC_REQUIRES_PRIVATE ${LIBIDN2_PC_REQUIRES} ${LIBCURL_PC_REQUIRES_PRIVATE})
      include_directories(SYSTEM ${LIBIDN2_INCLUDE_DIRS})
-@@ -1289,7 +1289,7 @@ set(USE_LIBPSL OFF)
+@@ -1293,7 +1293,7 @@ set(USE_LIBPSL OFF)
 
  if(CURL_USE_LIBPSL)
    find_package(Libpsl REQUIRED)
@@ -110,16 +110,16 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${LIBPSL_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBPSL_PC_REQUIRES})
    include_directories(SYSTEM ${LIBPSL_INCLUDE_DIRS})
-@@ -1308,7 +1308,7 @@ set(USE_LIBSSH2 OFF)
+@@ -1312,7 +1312,7 @@ set(USE_LIBSSH2 OFF)
  if(CURL_USE_LIBSSH2)
    find_package(Libssh2)
    if(LIBSSH2_FOUND)
--    list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
-+    list(APPEND CURL_LIBS ${LIBSSH2_LINK_LIBRARIES})
+-    set(CURL_LIBS ${LIBSSH2_LIBRARIES} ${CURL_LIBS})  # keep it before TLS-crypto, compression
++    list(PREPEND CURL_LIBS ${LIBSSH2_LINK_LIBRARIES}) # keep it before TLS-crypto, compression
      list(APPEND CURL_LIBDIRS ${LIBSSH2_LIBRARY_DIRS})
-     list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBSSH2_PC_REQUIRES})
+     set(LIBCURL_PC_REQUIRES_PRIVATE ${LIBSSH2_PC_REQUIRES} ${LIBCURL_PC_REQUIRES_PRIVATE})
      include_directories(SYSTEM ${LIBSSH2_INCLUDE_DIRS})
-@@ -1357,7 +1357,7 @@ option(CURL_USE_GSASL "Use libgsasl" OFF)
+@@ -1361,7 +1361,7 @@ option(CURL_USE_GSASL "Use libgsasl" OFF)
  mark_as_advanced(CURL_USE_GSASL)
  if(CURL_USE_GSASL)
    find_package(Libgsasl REQUIRED)
@@ -128,7 +128,7 @@ index d55cef4..cb97dd5 100644
    list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
    list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${LIBGSASL_PC_REQUIRES})
    include_directories(SYSTEM ${LIBGSASL_INCLUDE_DIRS})
-@@ -1376,7 +1376,7 @@ if(CURL_USE_GSSAPI)
+@@ -1380,7 +1380,7 @@ if(CURL_USE_GSSAPI)
 
    set(HAVE_GSSAPI ${GSS_FOUND})
    if(GSS_FOUND)
@@ -137,7 +137,7 @@ index d55cef4..cb97dd5 100644
      list(APPEND CURL_LIBDIRS ${GSS_LIBRARY_DIRS})
      list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${GSS_PC_REQUIRES})
      include_directories(SYSTEM ${GSS_INCLUDE_DIRS})
-@@ -1447,7 +1447,7 @@ endif()
+@@ -1451,7 +1451,7 @@ endif()
  option(USE_LIBRTMP "Enable librtmp from rtmpdump" OFF)
  if(USE_LIBRTMP)
    find_package(Librtmp REQUIRED)

vcpkg/overlay_ports/curl/pkgconfig-curl-config.patch

@@ -1,17 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b6b74c1..d01a127 100644
+index be7b193..a3f5918 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2260,6 +2260,7 @@ if(NOT CURL_DISABLE_INSTALL)
-   endforeach()
- 
-   foreach(_libdir IN LISTS _custom_libdirs CURL_LIBDIRS)
-+    cmake_path(SET _libdir NORMALIZE "${_libdir}")
-     list(FIND _sys_libdirs "${_libdir}" _libdir_index)
-     if(_libdir_index LESS 0)
-       list(APPEND _ldflags "-L${_libdir}")
-@@ -2271,7 +2272,30 @@ if(NOT CURL_DISABLE_INSTALL)
-     set(_implicit_libs ${CMAKE_C_IMPLICIT_LINK_LIBRARIES})
+@@ -2280,7 +2280,30 @@ if(NOT CURL_DISABLE_INSTALL)
+     set(_implicit_libs "${CMAKE_C_IMPLICIT_LINK_LIBRARIES}")
    endif()
 
 -  foreach(_lib IN LISTS _implicit_libs _custom_libs CURL_LIBS)
@@ -42,7 +34,7 @@ index b6b74c1..d01a127 100644
      if(TARGET "${_lib}")
        set(_libname "${_lib}")
        get_target_property(_imported "${_libname}" IMPORTED)
-@@ -2286,6 +2310,10 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2295,6 +2318,10 @@ if(NOT CURL_DISABLE_INSTALL)
          continue()
        endif()
      endif()
@@ -53,13 +45,7 @@ index b6b74c1..d01a127 100644
      if(_lib MATCHES "^-")  # '-framework <name>'
        list(APPEND _ldflags "${_lib}")
      elseif(_lib MATCHES "/")
-@@ -2294,17 +2322,24 @@ if(NOT CURL_DISABLE_INSTALL)
-       get_filename_component(_libdir ${_lib} DIRECTORY)
-       get_filename_component(_libname ${_lib} NAME_WE)
-       if(_libname MATCHES "^lib")
-+        cmake_path(SET _libdir NORMALIZE "${_libdir}")
-         list(FIND _sys_libdirs "${_libdir}" _libdir_index)
-         if(_libdir_index LESS 0)
+@@ -2311,12 +2338,18 @@ if(NOT CURL_DISABLE_INSTALL)
            list(APPEND _ldflags "-L${_libdir}")
          endif()
          string(REGEX REPLACE "^lib" "" _libname "${_libname}")
@@ -81,7 +67,7 @@ index b6b74c1..d01a127 100644
      endif()
    endforeach()
 
-@@ -2330,11 +2365,11 @@ if(NOT CURL_DISABLE_INSTALL)
+@@ -2342,11 +2375,11 @@ if(NOT CURL_DISABLE_INSTALL)
      set(LIBCURL_PC_REQUIRES "")
      set(LIBCURL_PC_LIBS     "")
      set(LIBCURL_PC_CFLAGS   "")
@@ -97,18 +83,19 @@ index b6b74c1..d01a127 100644
    if(BUILD_STATIC_LIBS)
      set(ENABLE_STATIC       "yes")
 diff --git a/curl-config.in b/curl-config.in
-index 5518416..e418afc 100644
+index 5518416..c0c29da 100644
 --- a/curl-config.in
 +++ b/curl-config.in
-@@ -156,6 +156,7 @@ while test "$#" -gt 0; do
+@@ -155,7 +155,7 @@ while test "$#" -gt 0; do
+       curllibdir=''
      fi
      if test 'X@ENABLE_SHARED@' = 'Xno'; then
-       echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
+-      echo "${curllibdir}-lcurl @LIBCURL_PC_LIBS_PRIVATE@"
 +      echo "@libdir@/libcurl.@libext@ @LIBCURL_PC_LDFLAGS_PRIVATE@ @CURL_CONFIG_LIBS_PRIVATE@ @LIBCURL_PC_LIBS_PRIVATE@"
      else
        echo "${curllibdir}-lcurl"
      fi
-@@ -167,7 +168,7 @@ while test "$#" -gt 0; do
+@@ -167,7 +167,7 @@ while test "$#" -gt 0; do
 
    --static-libs)
      if test 'X@ENABLE_STATIC@' != 'Xno'; then

vcpkg/overlay_ports/curl/portfile.cmake

@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
     REF ${curl_version}
-    SHA512 e7fabe3403096fdab7e9a817499c541a965c456ab07ffe981b58bed11bad62f9efa201d93d92e5f35503a5a30b25fc430ca7d7a5556eaffffd9bf98c163b667f
+    SHA512 04f6160c3c63c59e80987df61959bf0079c5be1d63bc40189933cebd3046850d680f1e030e8e7cd7f04417146982c6410ba70c8441af75d43b7b24fc7fbcb1d2
     HEAD_REF master
     PATCHES
         0005_remove_imp_suffix.patch

vcpkg/overlay_ports/curl/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "curl",
-  "version": "8.12.0",
+  "version": "8.12.1",
   "description": "A library for transferring data with URLs",
   "homepage": "https://curl.se/",
   "license": "curl AND ISC AND BSD-3-Clause",