Mercurial > hg > orthanc

changeset 1530:766a42aac55d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to libcurl 1.0.2d for static and Windows builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 12 Aug 2015 14:39:46 +0200
parents 4c1dbfddabd4
children 31b3a540f508
files NEWS Resources/CMake/LibCurlConfiguration.cmake Resources/CMake/OpenSslConfiguration.cmake UnitTestsSources/VersionsTests.cpp
diffstat 4 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Aug 12 14:25:17 2015 +0200
+++ b/NEWS	Wed Aug 12 14:39:46 2015 +0200
@@ -8,6 +8,7 @@
 -----------
 
 * Upgrade to curl 7.44.0 for static and Windows builds
+* Upgrade to libcurl 1.0.2d for static and Windows builds
 
 
 Version 0.9.3 (2015/08/07)
--- a/Resources/CMake/LibCurlConfiguration.cmake	Wed Aug 12 14:25:17 2015 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Wed Aug 12 14:39:46 2015 +0200
@@ -54,7 +54,7 @@
 
     set_property(
       SOURCE ${CURL_SOURCES}
-      PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;HAVE_LONGLONG;OS=\"${TMP_OS}\""
+      PROPERTY COMPILE_DEFINITIONS "HAVE_TIME_H;HAVE_STRUCT_TIMEVAL;HAVE_SYS_STAT_H;HAVE_SOCKET;HAVE_STRUCT_SOCKADDR_STORAGE;HAVE_SYS_SOCKET_H;HAVE_SOCKET;HAVE_SYS_SOCKET_H;HAVE_NETINET_IN_H;HAVE_NETDB_H;HAVE_FCNTL_O_NONBLOCK;HAVE_FCNTL_H;HAVE_SELECT;HAVE_ERRNO_H;HAVE_SEND;HAVE_RECV;HAVE_LONGLONG;HAVE_BOOL_T;OS=\"${TMP_OS}\""
       )
 
     if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--- a/Resources/CMake/OpenSslConfiguration.cmake	Wed Aug 12 14:25:17 2015 +0200
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Wed Aug 12 14:39:46 2015 +0200
@@ -1,8 +1,8 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
-  SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.1g)
+  SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2d)
   DownloadPackage(
-    "de62b43dfcd858e66a74bee1c834e959"
-    "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1g.tar.gz"
+    "38dd619b2e77cbac69b99f52a053d25a"
+    "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.2d.tar.gz"
     "${OPENSSL_SOURCES_DIR}")
 
   if (NOT EXISTS "${OPENSSL_SOURCES_DIR}/include/PATCHED")
--- a/UnitTestsSources/VersionsTests.cpp	Wed Aug 12 14:25:17 2015 +0200
+++ b/UnitTestsSources/VersionsTests.cpp	Wed Aug 12 14:39:46 2015 +0200
@@ -134,7 +134,7 @@
 
 TEST(Version, OpenSslStatic)
 {
-  ASSERT_EQ(0x1000107fL /* openssl-1.0.1g */, OPENSSL_VERSION_NUMBER);
+  ASSERT_EQ(0x1000204fL /* openssl-1.0.2d */, OPENSSL_VERSION_NUMBER);
 }