# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1550778037 -3600
# Node ID 544905c73c7e4a928b0ddcc0ab3bf3fa419e867e
# Parent  afc38fd21c785410909f4f8a710cdb9431a5c18a
upgrade to curl 1.64.0

diff -r afc38fd21c78 -r 544905c73c7e NEWS
--- a/NEWS	Thu Feb 21 20:32:33 2019 +0100
+++ b/NEWS	Thu Feb 21 20:40:37 2019 +0100
@@ -19,11 +19,12 @@
 -----------
 
 * Fix issue #134 (/patient/modify gives 500, should really be 400)
-* Support of SOP classes: BreastProjectionXRayImageStorageForProcessing/Presentation
+* Accept SOP classes: BreastProjectionXRayImageStorageForProcessing/Presentation
 * More tolerance wrt. missing DICOM tags that must be returned by Orthanc C-FIND SCP
 * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio
 * Upgraded dependencies for static builds (notably on Windows):
   - boost 1.69.0
+  - curl 1.64.0
   - dcmtk 3.6.4
   - e2fsprogs 1.44.5 (libuuid)
   - googletest 1.8.1
diff -r afc38fd21c78 -r 544905c73c7e Resources/CMake/LibCurlConfiguration.cmake
--- a/Resources/CMake/LibCurlConfiguration.cmake	Thu Feb 21 20:32:33 2019 +0100
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Thu Feb 21 20:40:37 2019 +0100
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_CURL)
-  SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.57.0)
-  SET(CURL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/curl-7.57.0.tar.gz")
-  SET(CURL_MD5 "c7aab73aaf5e883ca1d7518f93649dc2")
+  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")
 
   if (IS_DIRECTORY "${CURL_SOURCES_DIR}")
     set(FirstRun OFF)
@@ -14,7 +14,7 @@
   if (FirstRun)
     execute_process(
       COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${ORTHANC_ROOT}/Resources/Patches/curl-7.57.0-cmake.patch
+      ${ORTHANC_ROOT}/Resources/Patches/curl-7.64.0-cmake.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
diff -r afc38fd21c78 -r 544905c73c7e Resources/Patches/curl-7.64.0-cmake.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Patches/curl-7.64.0-cmake.patch	Thu Feb 21 20:40:37 2019 +0100
@@ -0,0 +1,12 @@
+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 afc38fd21c78 -r 544905c73c7e UnitTestsSources/VersionsTests.cpp
--- a/UnitTestsSources/VersionsTests.cpp	Thu Feb 21 20:32:33 2019 +0100
+++ b/UnitTestsSources/VersionsTests.cpp	Thu Feb 21 20:40:37 2019 +0100
@@ -121,7 +121,7 @@
 TEST(Versions, CurlStatic)
 {
   curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
-  ASSERT_STREQ("7.57.0", v->version);
+  ASSERT_STREQ("7.64.0", v->version);
 }
 
 TEST(Versions, PngStatic)