Mercurial > hg > orthanc

changeset 2356:7b3b82d426ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removal of unneeded patch for speed in DCMTK 3.6.2
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Jul 2017 12:02:41 +0200
parents e2e5dde95027
children 1bafa53f9d02 f75b425467fa
files Resources/CMake/DcmtkConfiguration.cmake Resources/Patches/dcmtk-3.6.2-speed.patch
diffstat 2 files changed, 50 insertions(+), 73 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Wed Jul 19 09:10:02 2017 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Wed Jul 19 12:02:41 2017 +0200
@@ -17,7 +17,6 @@
     SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.2)
     SET(DCMTK_URL "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.2.tar.gz")
     SET(DCMTK_MD5 "d219a4152772985191c9b89d75302d12")
-    SET(DCMTK_PATCH_SPEED "${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-speed.patch")
 
     macro(DCMTK_UNSET)
     endmacro()
@@ -39,34 +38,56 @@
   DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
 
   
-  if (FirstRun AND
-      USE_DCMTK_360)
-    # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
-    # 3.6.2. This adds support for more private tags, and fixes some
-    # import problems with Philips MRI Achieva.
-    if (USE_DCMTK_362_PRIVATE_DIC)
-      message("Using the dictionary of private tags from DCMTK 3.6.2")
-      configure_file(
-        ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic
-        ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
-        COPYONLY)
-    else()
-      message("Using the dictionary of private tags from DCMTK 3.6.0")
+  if (FirstRun)
+    if (USE_DCMTK_360)
+      # If using DCMTK 3.6.0, backport the "private.dic" file from DCMTK
+      # 3.6.2. This adds support for more private tags, and fixes some
+      # import problems with Philips MRI Achieva.
+      if (USE_DCMTK_362_PRIVATE_DIC)
+        message("Using the dictionary of private tags from DCMTK 3.6.2")
+        configure_file(
+          ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-private.dic
+          ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
+          COPYONLY)
+      else()
+        message("Using the dictionary of private tags from DCMTK 3.6.0")
+      endif()
+      
+      # Patches specific to DCMTK 3.6.0
+      message("Applying patch to solve vulnerability in DCMTK 3.6.0")
+      execute_process(
+        COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+        ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        RESULT_VARIABLE Failure
+        )
+
+      if (Failure)
+        message(FATAL_ERROR "Error while patching a file")
+      endif()
+
+      # This patch is not needed anymore thanks to the following commit
+      # (information sent by Jorg Riesmeier on Twitter on 2017-07-19):
+      # http://git.dcmtk.org/?p=dcmtk.git;a=commit;h=8df1f5e517b8629ae09088d0935c2a8dd333c76f
+      message("Applying patch for speed in DCMTK 3.6.0")
+      execute_process(
+        COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+        ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-speed.patch
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        RESULT_VARIABLE Failure
+        )
+
+      if (Failure)
+        message(FATAL_ERROR "Error while patching a file")
+      endif()
+
+    else (FirstRun())
+      message("No need to apply a patch for speed in DCMTK")
     endif()
-    
-    # Patches specific to DCMTK 3.6.0
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE Failure
-      )
-
-    if (Failure)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
+  else()
+    message("The patches for DCMTK have already been applied")
   endif()
 
-
   IF (CMAKE_CROSSCOMPILING)
     if (CMAKE_COMPILER_IS_GNUCXX AND
         ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")  # MinGW
@@ -187,16 +208,6 @@
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/windebap.cc
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/winsock.cc
       )
-    
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${DCMTK_PATCH_SPEED}
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE Failure
-      )
-
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
 
   elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     list(REMOVE_ITEM DCMTK_SOURCES 
@@ -204,7 +215,9 @@
       ${DCMTK_SOURCES_DIR}/oflog/libsrc/clfsap.cc
       )
 
-    if (CMAKE_COMPILER_IS_GNUCXX AND DCMTK_PATCH_MINGW64)
+    if (CMAKE_COMPILER_IS_GNUCXX AND
+        DCMTK_PATCH_MINGW64 AND
+        USE_DCMTK_360)
       # This is a patch for MinGW64
       execute_process(
         COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${DCMTK_PATCH_MINGW64}
@@ -216,18 +229,6 @@
         message(FATAL_ERROR "Error while patching a file")
       endif()
     endif()
-
-    # This patch improves speed, even for Windows
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N 
-      INPUT_FILE ${DCMTK_PATCH_SPEED}
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE Failure
-      )
-
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
-    endif()
   endif()
 
   list(REMOVE_ITEM DCMTK_SOURCES 
--- a/Resources/Patches/dcmtk-3.6.2-speed.patch	Wed Jul 19 09:10:02 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-diff -urEb dcmtk-3.6.2.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.2/dcmnet/libsrc/dul.cc
---- dcmtk-3.6.2.orig/dcmnet/libsrc/dul.cc	2017-07-17 17:54:10.406140454 +0200
-+++ dcmtk-3.6.2/dcmnet/libsrc/dul.cc	2017-07-17 17:54:48.681341404 +0200
-@@ -1862,7 +1862,7 @@
-         msg += OFStandard::getLastNetworkErrorCode().message();
-         return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
-     }
--    setTCPBufferLength(sock);
-+    //setTCPBufferLength(sock);
- 
-     /*
-      * Disable the so-called Nagle algorithm (if requested).
-diff -urEb dcmtk-3.6.2.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.2/dcmnet/libsrc/dulfsm.cc
---- dcmtk-3.6.2.orig/dcmnet/libsrc/dulfsm.cc	2017-07-17 17:54:10.406140454 +0200
-+++ dcmtk-3.6.2/dcmnet/libsrc/dulfsm.cc	2017-07-17 17:55:04.122634664 +0200
-@@ -2447,7 +2447,7 @@
-           msg += OFStandard::getLastNetworkErrorCode().message();
-           return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
-         }
--        setTCPBufferLength(s);
-+        //setTCPBufferLength(s);
- 
-         /*
-          * Disable the so-called Nagle algorithm (if requested).