# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1499253105 -7200
# Node ID 46a3121527447d63f3fb9cf1fbae1d86a4921736
# Parent  17e8e8e1ff3d766f50fac1c3c2eac1b924ce3e6d
Upgrade forthcoming DCMTK 3.6.1 to snapshot 20170228

diff -r 17e8e8e1ff3d -r 46a312152744 NEWS
--- a/NEWS	Wed Jul 05 12:42:59 2017 +0200
+++ b/NEWS	Wed Jul 05 13:11:45 2017 +0200
@@ -26,6 +26,7 @@
 * Fix issue 49 (Worklists: accentuated characters are removed from C-Find responses)
 * Fix Debian #865606 (orthanc FTBFS with libdcmtk-dev 3.6.1~20170228-2)
 * Fix XSS inside DICOM in Orthanc Explorer (as reported by Victor Pasnkel, Morphus Labs)
+* Upgrade forthcoming DCMTK 3.6.1 to snapshot 20170228
 
 
 Version 1.2.0 (2016/12/13)
diff -r 17e8e8e1ff3d -r 46a312152744 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Jul 05 12:42:59 2017 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Jul 05 13:11:45 2017 +0200
@@ -6,9 +6,9 @@
   if (USE_DCMTK_361)
     SET(DCMTK_VERSION_NUMBER 361)
     SET(DCMTK_PACKAGE_VERSION "3.6.1")
-    SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20160216)
-    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.1_20160216.tar.gz")
-    SET(DCMTK_MD5 "273c8a544b9fe09b8a4fb4eb51df8e52")
+    SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.1_20170228)
+    SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.1_20170228.tar.gz")
+    SET(DCMTK_MD5 "65f3520fce5d084c3530ae7252e39f3e")
     SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.1-speed.patch")
 
     macro(DCMTK_UNSET)
diff -r 17e8e8e1ff3d -r 46a312152744 Resources/Patches/dcmtk-3.6.1-speed.patch
--- a/Resources/Patches/dcmtk-3.6.1-speed.patch	Wed Jul 05 12:42:59 2017 +0200
+++ b/Resources/Patches/dcmtk-3.6.1-speed.patch	Wed Jul 05 13:11:45 2017 +0200
@@ -1,26 +1,24 @@
-diff -urEb dcmtk-3.6.1_20160216.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.1_20160216/dcmnet/libsrc/dul.cc
---- dcmtk-3.6.1_20160216.orig/dcmnet/libsrc/dul.cc	2016-04-05 12:56:28.962230391 +0200
-+++ dcmtk-3.6.1_20160216/dcmnet/libsrc/dul.cc	2016-04-05 12:57:15.814232296 +0200
-@@ -1841,7 +1841,7 @@
+diff -urEb dcmtk-3.6.1_20170228.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.1_20170228/dcmnet/libsrc/dul.cc
+--- dcmtk-3.6.1_20170228.orig/dcmnet/libsrc/dul.cc	2017-07-05 12:57:20.707214499 +0200
++++ dcmtk-3.6.1_20170228/dcmnet/libsrc/dul.cc	2017-07-05 12:58:03.563590489 +0200
+@@ -1789,7 +1789,7 @@
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }
  #endif
 -    setTCPBufferLength(sock);
 +    //setTCPBufferLength(sock);
  
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
      /*
-Only in dcmtk-3.6.1_20160216/dcmnet/libsrc: dul.cc~
-diff -urEb dcmtk-3.6.1_20160216.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.1_20160216/dcmnet/libsrc/dulfsm.cc
---- dcmtk-3.6.1_20160216.orig/dcmnet/libsrc/dulfsm.cc	2016-04-05 12:56:28.962230391 +0200
-+++ dcmtk-3.6.1_20160216/dcmnet/libsrc/dulfsm.cc	2016-04-05 12:57:31.946232952 +0200
-@@ -2431,7 +2431,7 @@
+      * Disable the so-called Nagle algorithm (if requested).
+diff -urEb dcmtk-3.6.1_20170228.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.1_20170228/dcmnet/libsrc/dulfsm.cc
+--- dcmtk-3.6.1_20170228.orig/dcmnet/libsrc/dulfsm.cc	2017-07-05 12:57:20.707214499 +0200
++++ dcmtk-3.6.1_20170228/dcmnet/libsrc/dulfsm.cc	2017-07-05 12:58:17.995717258 +0200
+@@ -2419,7 +2419,7 @@
            return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
          }
  #endif
 -        setTCPBufferLength(s);
 +        //setTCPBufferLength(s);
  
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
          /*
-Only in dcmtk-3.6.1_20160216/dcmnet/libsrc: dulfsm.cc~
+          * Disable the so-called Nagle algorithm (if requested).
diff -r 17e8e8e1ff3d -r 46a312152744 Resources/Patches/dcmtk.txt
--- a/Resources/Patches/dcmtk.txt	Wed Jul 05 12:42:59 2017 +0200
+++ b/Resources/Patches/dcmtk.txt	Wed Jul 05 13:11:45 2017 +0200
@@ -7,4 +7,4 @@
 For "dcmtk-3.6.1-private.dic"
 =============================
 
-# cp ../../ThirdPartyDownloads/dcmtk-3.6.1_20160216/dcmdata/data/private.dic dcmtk-3.6.1-private.dic
+# cp ../../ThirdPartyDownloads/dcmtk-3.6.1_20170228/dcmdata/data/private.dic dcmtk-3.6.1-private.dic