# HG changeset patch # User Sebastien Jodogne # Date 1439383186 -7200 # Node ID 766a42aac55db3ba672e4650000389c0b8c515e6 # Parent 4c1dbfddabd4b0983c96702a3d34d3daeae4822f Upgrade to libcurl 1.0.2d for static and Windows builds diff -r 4c1dbfddabd4 -r 766a42aac55d NEWS --- 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) diff -r 4c1dbfddabd4 -r 766a42aac55d Resources/CMake/LibCurlConfiguration.cmake --- 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") diff -r 4c1dbfddabd4 -r 766a42aac55d Resources/CMake/OpenSslConfiguration.cmake --- 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") diff -r 4c1dbfddabd4 -r 766a42aac55d UnitTestsSources/VersionsTests.cpp --- 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); }