From 1ad4b1d2ff31265d9400aecf7229eeda0081ff23 Mon Sep 17 00:00:00 2001
From: Gunnar Schaefer <gsfr@flywheel.io>
Date: Tue, 30 May 2017 15:58:06 -0700
Subject: [PATCH] Update to latest (patched) dcmtk

---
 Dockerfile  |  5 +++--
 dcmtk.patch | 25 +++++++------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5da17b7..d8ce95c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 FROM alpine as build
 
-RUN apk add --no-cache build-base curl
+RUN apk add --no-cache build-base git
 
+RUN git clone git://git.dcmtk.org/dcmtk.git
 WORKDIR dcmtk
-RUN curl http://support.dcmtk.org/redmine/attachments/download/87/dcmtk-3.6.1_20150924.tar.gz | tar xz --strip-components 1
+RUN git checkout -qf 6c5329a82728bee2c7b6c7a05dbff192a2418d87
 
 COPY dcmtk.patch .
 RUN patch -p1 <dcmtk.patch
diff --git a/dcmtk.patch b/dcmtk.patch
index c12a4d8..c766afc 100644
--- a/dcmtk.patch
+++ b/dcmtk.patch
@@ -1,18 +1,7 @@
-diff -Naur dcmtk-3.6.1_20150924/config/configure dcmtk-3.6.1_20150924.patch/config/configure
---- dcmtk-3.6.1_20150924/config/configure	2015-09-24 07:27:10.000000000 -0500
-+++ dcmtk-3.6.1_20150924.patch/config/configure	2017-04-27 17:26:22.000000000 -0500
-@@ -8551,7 +8551,6 @@
-   ac_fn_cxx_check_header_mongrel "$LINENO" "fenv.h" "ac_cv_header_fenv_h" "$ac_includes_default"
- if test "x$ac_cv_header_fenv_h" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
--#define HAVE_FENV_H 1
- _ACEOF
- 
- fi
-diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patch/dcmnet/apps/movescu.cc
---- dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc	2015-09-24 07:27:10.000000000 -0500
-+++ dcmtk-3.6.1_20150924.patch/dcmnet/apps/movescu.cc	2017-04-27 17:51:26.000000000 -0500
-@@ -53,6 +53,12 @@
+diff -Naur dcmtk/dcmnet/apps/movescu.cc dcmtk.patched/dcmnet/apps/movescu.cc
+--- dcmtk/dcmnet/apps/movescu.cc	2017-05-30 14:10:19.000000000 -0700
++++ dcmtk.patched/dcmnet/apps/movescu.cc	2017-05-30 14:09:29.000000000 -0700
+@@ -48,6 +48,12 @@
  
  #define OFFIS_CONSOLE_APPLICATION "movescu"
  
@@ -25,9 +14,9 @@ diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patc
  static OFLogger movescuLogger = OFLog::getLogger("dcmtk.apps." OFFIS_CONSOLE_APPLICATION);
  
  static char rcsid[] = "$dcmtk: " OFFIS_CONSOLE_APPLICATION " v"
-@@ -1170,6 +1176,9 @@
+@@ -1248,6 +1254,9 @@
                  (*assoc)->params,
-                 dcmAllStorageSOPClassUIDs, numberOfAllDcmStorageSOPClassUIDs,
+                 dcmAllStorageSOPClassUIDs, numberOfDcmAllStorageSOPClassUIDs,
                  transferSyntaxes, numTransferSyntaxes);
 +            /* accept everything not known not to be a storage SOP class */
 +            cond = acceptUnknownContextsWithPreferredTransferSyntaxes(
@@ -35,7 +24,7 @@ diff -Naur dcmtk-3.6.1_20150924/dcmnet/apps/movescu.cc dcmtk-3.6.1_20150924.patc
          }
      }
      if (cond.good())
-@@ -1189,6 +1198,141 @@
+@@ -1267,6 +1276,141 @@
      return cond;
  }