# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1706113872 -3600
# Node ID 5910aa0c96cea6605392b933b0b19223d76e50bf
# Parent  834be222605b06ff3f372264f01b264d7d2a97a8
upgraded to curl 8.5.0

diff -r 834be222605b -r 5910aa0c96ce NEWS
--- a/NEWS	Wed Jan 24 17:16:06 2024 +0100
+++ b/NEWS	Wed Jan 24 17:31:12 2024 +0100
@@ -12,6 +12,7 @@
 
 * Upgraded dependencies for static builds:
   - boost 1.84.0
+  - curl 8.5.0
   - dcmtk 3.6.8
   - openssl 3.1.4
 
diff -r 834be222605b -r 5910aa0c96ce OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 17:16:06 2024 +0100
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Wed Jan 24 17:31:12 2024 +0100
@@ -20,9 +20,9 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
-  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.77.0)
-  SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-7.77.0.tar.gz")
-  SET(CURL_MD5 "478e8b06801d9d030609c9e6cf859229")
+  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-8.5.0)
+  SET(CURL_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/curl-8.5.0.tar.gz")
+  SET(CURL_MD5 "0bc69288b20ae165ff4b7d6d7bbe70d2")
 
   if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
     set(FirstRun OFF)
@@ -35,7 +35,7 @@
   if (FirstRun)
     execute_process(
       COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.77.0.patch
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-8.5.0.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
@@ -46,11 +46,14 @@
   endif()
   
   include_directories(
+    SYSTEM BEFORE
     ${CURL_SOURCES_DIR}/include
+    ${CURL_SOURCES_DIR}/lib
     )
 
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vauth CURL_SOURCES)
+  AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vquic CURL_SOURCES)
   AUX_SOURCE_DIRECTORY(${CURL_SOURCES_DIR}/lib/vtls CURL_SOURCES)
   source_group(ThirdParty\\LibCurl REGULAR_EXPRESSION ${CURL_SOURCES_DIR}/.*)
 
diff -r 834be222605b -r 5910aa0c96ce OrthancFramework/Resources/Patches/curl-7.77.0.patch
--- a/OrthancFramework/Resources/Patches/curl-7.77.0.patch	Wed Jan 24 17:16:06 2024 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -urEb curl-7.77.0.orig/CMake/Macros.cmake curl-7.77.0/CMake/Macros.cmake
---- curl-7.77.0.orig/CMake/Macros.cmake	2021-06-22 10:31:21.875004553 +0200
-+++ curl-7.77.0/CMake/Macros.cmake	2021-06-22 10:31:45.219024665 +0200
-@@ -59,7 +59,7 @@
-     message(STATUS "Performing Curl Test ${CURL_TEST}")
-     try_compile(${CURL_TEST}
-       ${CMAKE_BINARY_DIR}
--      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
-+      ${CURL_SOURCES_DIR}/CMake/CurlTests.c
-       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
-       "${CURL_TEST_ADD_LIBRARIES}"
-       OUTPUT_VARIABLE OUTPUT)
-diff -urEb curl-7.77.0.orig/lib/vssh/ssh.h curl-7.77.0/lib/vssh/ssh.h
---- curl-7.77.0.orig/lib/vssh/ssh.h	2021-06-22 10:31:21.843004526 +0200
-+++ curl-7.77.0/lib/vssh/ssh.h	2021-06-22 10:36:34.271266232 +0200
-@@ -22,7 +22,7 @@
-  *
-  ***************************************************************************/
- 
--#include "curl_setup.h"
-+#include "../curl_setup.h"
- 
- #if defined(HAVE_LIBSSH2_H)
- #include <libssh2.h>
diff -r 834be222605b -r 5910aa0c96ce OrthancFramework/Resources/Patches/curl-8.5.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/Resources/Patches/curl-8.5.0.patch	Wed Jan 24 17:31:12 2024 +0100
@@ -0,0 +1,12 @@
+diff -urEb curl-8.5.0.orig/CMake/Macros.cmake curl-8.5.0/CMake/Macros.cmake
+--- curl-8.5.0.orig/CMake/Macros.cmake	2024-01-24 17:21:21.387965189 +0100
++++ curl-8.5.0/CMake/Macros.cmake	2024-01-24 17:21:48.523719072 +0100
+@@ -48,7 +48,7 @@
+     message(STATUS "Performing Curl Test ${CURL_TEST}")
+     try_compile(${CURL_TEST}
+       ${CMAKE_BINARY_DIR}
+-      ${CMAKE_CURRENT_SOURCE_DIR}/CMake/CurlTests.c
++      ${CURL_SOURCES_DIR}/CMake/CurlTests.c
+       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
+       "${CURL_TEST_ADD_LIBRARIES}"
+       OUTPUT_VARIABLE OUTPUT)
diff -r 834be222605b -r 5910aa0c96ce OrthancServer/UnitTestsSources/VersionsTests.cpp
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:16:06 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 17:31:12 2024 +0100
@@ -119,7 +119,7 @@
 TEST(Versions, CurlStatic)
 {
   curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
-  ASSERT_STREQ("7.77.0", v->version);
+  ASSERT_STREQ("8.5.0", v->version);
 }
 
 TEST(Versions, PngStatic)