# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1522229479 -7200
# Node ID 9d9f2d088dce566493f0ffc4ec565210766bbdf9
# Parent  91ee08d986f9bd70f40b23587bb32f380c16fbab
upgrade to zlib 1.2.11

diff -r 91ee08d986f9 -r 9d9f2d088dce NEWS
--- a/NEWS	Wed Mar 28 11:24:17 2018 +0200
+++ b/NEWS	Wed Mar 28 11:31:19 2018 +0200
@@ -29,13 +29,15 @@
 
 * Orthanc now uses UTC (universal time) instead of local time in its database
 * Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005)
-* Upgrade to curl 7.57.0 for static and Windows builds
 * Support of Linux Standard Base
 * Static linking against libuuid (from e2fsprogs)
 * Fix static build on CentOS 6
-* Upgrade to JsonCpp 1.8.4 for static builds
 * Possibility of using JsonCpp 0.10.6 if the compiler does not support C++11
   with the "-DUSE_LEGACY_JSONCPP=ON" CMake option
+* Upgraded dependencies for static and Windows builds:
+  - curl 7.57.0
+  - jsoncpp 1.8.4
+  - zlib 1.2.11
 
 
 Version 1.3.1 (2017-11-29)
diff -r 91ee08d986f9 -r 9d9f2d088dce Resources/CMake/ZlibConfiguration.cmake
--- a/Resources/CMake/ZlibConfiguration.cmake	Wed Mar 28 11:24:17 2018 +0200
+++ b/Resources/CMake/ZlibConfiguration.cmake	Wed Mar 28 11:31:19 2018 +0200
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_ZLIB)
-  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
-  SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz")
-  SET(ZLIB_MD5 "60df6a37c56e7c1366cca812414f7b85")
+  SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.11)
+  SET(ZLIB_URL "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.11.tar.gz")
+  SET(ZLIB_MD5 "1c9f62f0778697a09d36121ead88e08e")
 
   DownloadPackage(${ZLIB_MD5} ${ZLIB_URL} "${ZLIB_SOURCES_DIR}")
 
diff -r 91ee08d986f9 -r 9d9f2d088dce UnitTestsSources/VersionsTests.cpp
--- a/UnitTestsSources/VersionsTests.cpp	Wed Mar 28 11:24:17 2018 +0200
+++ b/UnitTestsSources/VersionsTests.cpp	Wed Mar 28 11:31:19 2018 +0200
@@ -99,7 +99,7 @@
 
 TEST(Versions, ZlibStatic)
 {
-  ASSERT_STREQ("1.2.7", zlibVersion());
+  ASSERT_STREQ("1.2.11", zlibVersion());
 }
 
 TEST(Versions, BoostStatic)