# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1624351208 -7200
# Node ID dbb1a90c4df48ff1923d375375cb573cf686c082
# Parent  81ad9d8a0fa6d282c54e0195bfcc6893fb046d23
upgrade to curl 7.77.0

diff -r 81ad9d8a0fa6 -r dbb1a90c4df4 NEWS
--- a/NEWS	Tue Jun 22 09:28:01 2021 +0200
+++ b/NEWS	Tue Jun 22 10:40:08 2021 +0200
@@ -48,6 +48,8 @@
 * Full support of hierarchical relationships in tags whose VR is UI during anonymization
 * C-MOVE SCP: added possible DIMSE status "Sub-operations Complete - One or more Failures"
 * Fix issue #146 (Update Anonyization to 2019c) - was actually updated to 2021b
+* Upgraded dependencies for static builds (notably on Windows):
+  - curl 7.77.0
 
 
 Version 1.9.3 (2021-05-07)
@@ -681,7 +683,7 @@
 * Fix issue #134 (/patient/modify gives 500, should really be 400)
 * Upgraded dependencies for static builds (notably on Windows):
   - boost 1.69.0
-  - curl 1.64.0
+  - curl 7.64.0
   - dcmtk 3.6.4
   - e2fsprogs 1.44.5 (libuuid)
   - googletest 1.8.1
diff -r 81ad9d8a0fa6 -r dbb1a90c4df4 OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake
--- a/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Tue Jun 22 09:28:01 2021 +0200
+++ b/OrthancFramework/Resources/CMake/LibCurlConfiguration.cmake	Tue Jun 22 10:40:08 2021 +0200
@@ -19,9 +19,9 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
-  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.64.0)
-  SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.64.0.tar.gz")
-  SET(CURL_MD5 "a026740d599a32bcbbe6e70679397899")
+  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.77.0)
+  SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.77.0.tar.gz")
+  SET(CURL_MD5 "478e8b06801d9d030609c9e6cf859229")
 
   if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
     set(FirstRun OFF)
@@ -34,7 +34,7 @@
   if (FirstRun)
     execute_process(
       COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.64.0-cmake.patch
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/curl-7.77.0.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
diff -r 81ad9d8a0fa6 -r dbb1a90c4df4 OrthancFramework/Resources/Patches/curl-7.57.0-cmake.patch
--- a/OrthancFramework/Resources/Patches/curl-7.57.0-cmake.patch	Tue Jun 22 09:28:01 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urEb curl-7.57.0.orig/CMake/Macros.cmake curl-7.57.0/CMake/Macros.cmake
---- curl-7.57.0.orig/CMake/Macros.cmake	2017-11-09 23:40:36.000000000 +0100
-+++ curl-7.57.0/CMake/Macros.cmake	2018-01-03 10:39:15.589520034 +0100
-@@ -38,7 +38,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 81ad9d8a0fa6 -r dbb1a90c4df4 OrthancFramework/Resources/Patches/curl-7.64.0-cmake.patch
--- a/OrthancFramework/Resources/Patches/curl-7.64.0-cmake.patch	Tue Jun 22 09:28:01 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -urEb curl-7.64.0.orig/CMake/Macros.cmake curl-7.64.0/CMake/Macros.cmake
---- curl-7.64.0.orig/CMake/Macros.cmake	2019-02-21 20:35:26.403471603 +0100
-+++ curl-7.64.0/CMake/Macros.cmake	2019-02-21 20:36:19.987272782 +0100
-@@ -38,7 +38,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 81ad9d8a0fa6 -r dbb1a90c4df4 OrthancFramework/Resources/Patches/curl-7.77.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/Resources/Patches/curl-7.77.0.patch	Tue Jun 22 10:40:08 2021 +0200
@@ -0,0 +1,24 @@
+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 81ad9d8a0fa6 -r dbb1a90c4df4 OrthancServer/UnitTestsSources/VersionsTests.cpp
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Tue Jun 22 09:28:01 2021 +0200
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Tue Jun 22 10:40:08 2021 +0200
@@ -129,7 +129,7 @@
 TEST(Versions, CurlStatic)
 {
   curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
-  ASSERT_STREQ("7.64.0", v->version);
+  ASSERT_STREQ("7.77.0", v->version);
 }
 
 TEST(Versions, PngStatic)