Update to latest (patched) dcmtk

scitran · May 30, 2017 · 1ad4b1d · 1ad4b1d
1 parent 9ec444c
commit 1ad4b1d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git 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
@@ -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,17 +14,17 @@ 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(
 +                (*assoc)->params, transferSyntaxes, numTransferSyntaxes);
          }
      }
      if (cond.good())
-@@ -1189,6 +1198,141 @@
+@@ -1267,6 +1276,141 @@
      return cond;
  }