[med-svn] [dcmtk] 06/14: Update patches
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Mar 6 10:51:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository dcmtk.
commit 100892ce8a4fbb7e176e8e989fd2c1901cea8d34
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Sat Mar 4 11:59:38 2017 +0000
Update patches
---
debian/patches/01_dcmtk_3.6.0-1.patch | 63 ++++++++++------------
debian/patches/03_datadic_install.patch | 16 +++---
...4_Fixed-OFoptional-by-introducing-OFalign.patch | 30 ++++-------
debian/patches/05_performance.patch | 18 +++----
debian/patches/06_soversion_abi.patch | 6 +--
.../patches/07_dont_export_all_executables.patch | 6 +--
debian/patches/08_remove_system_processor.patch | 28 ++++------
7 files changed, 65 insertions(+), 102 deletions(-)
diff --git a/debian/patches/01_dcmtk_3.6.0-1.patch b/debian/patches/01_dcmtk_3.6.0-1.patch
index 9763e7f..ec40c2b 100644
--- a/debian/patches/01_dcmtk_3.6.0-1.patch
+++ b/debian/patches/01_dcmtk_3.6.0-1.patch
@@ -4,21 +4,20 @@ Description: The original maintainer Jürgen Salk applied
changes to C++ code
Forwarded: no
-Index: b/dcmqrdb/etc/dcmqrscp.cfg
-===================================================================
---- a/dcmqrdb/etc/dcmqrscp.cfg 2016-11-07 12:34:04.883035438 +0100
-+++ b/dcmqrdb/etc/dcmqrscp.cfg 2016-11-07 12:34:04.855035786 +0100
-@@ -10,6 +10,9 @@
- NetworkTCPPort = 104
- MaxPDUSize = 16384
- MaxAssociations = 16
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
-+
+--- a/dcmqrdb/etc/dcmqrscp.cfg
++++ b/dcmqrdb/etc/dcmqrscp.cfg
+@@ -21,8 +21,8 @@
+ # SpecificCharacterSet = "ISO_IR 192", override, discard, transliterate
+
+ #
+-# UserName = <not used>
+-# GroupName = <not used>
++UserName = dcmtk
++GroupName = dcmtk
+
+ HostTable BEGIN
#
- # UserName = <not used>
- # GroupName = <not used>
-@@ -28,12 +31,13 @@
+@@ -38,12 +38,13 @@
# NOTE: in the current implementation you cannot substitute an IP address
# for a hostname.
#
@@ -38,7 +37,7 @@ Index: b/dcmqrdb/etc/dcmqrscp.cfg
#
HostTable END
-@@ -51,8 +55,9 @@
+@@ -61,8 +62,9 @@
# VendorName = SymbolicName
# The symbolic name should be defined in the HostTable.
#
@@ -50,7 +49,7 @@ Index: b/dcmqrdb/etc/dcmqrscp.cfg
#
VendorTable END
-@@ -70,8 +75,13 @@
+@@ -80,8 +82,13 @@
# Entry in HostTable |
# ANY
#
@@ -67,24 +66,16 @@ Index: b/dcmqrdb/etc/dcmqrscp.cfg
+#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
#
AETable END
-Index: b/dcmqrdb/docs/dcmqrcnf.txt
-===================================================================
---- a/dcmqrdb/docs/dcmqrcnf.txt 2016-11-07 12:34:04.883035438 +0100
-+++ b/dcmqrdb/docs/dcmqrcnf.txt 2016-11-07 12:34:04.855035786 +0100
-@@ -44,8 +44,8 @@
- NetworkTCPPort = 104
- MaxPDUSize = 8192
- MaxAssociations = 20
--UserName = (do not change user)
--GroupName = (do not change group)
-+UserName = "dcmtk"
-+GroupName = "dcmtk"
+--- a/dcmqrdb/docs/dcmqrcnf.txt
++++ b/dcmqrdb/docs/dcmqrcnf.txt
+@@ -46,8 +46,8 @@
+ MaxPDUSize = 8192
+ MaxAssociations = 20
+ SpecificCharacterSet = fallback
+-UserName = (do not change user)
+-GroupName = (do not change group)
++UserName = dcmtk
++GroupName = dcmtk
+
+ Available options for specific character sets are:
- NOTE: You must have root privileges to bind port 104 for DICOM association
- requests on Unix/Linux/Posix platforms as this is a privileged port number
-Index: b/dcmwlm/wlistdb/OFFIS/lockfile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/dcmwlm/wlistdb/OFFIS/lockfile 2016-11-07 12:34:04.855035786 +0100
-@@ -0,0 +1 @@
-+
diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 8e6ebbd..74fa1e4 100644
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -3,20 +3,16 @@ Author: Mathieu Malaterre <malat at debian.org>
Bug-Debian: http://bugs.debian.org/709123
Forwarded: no
-Index: b/dcmdata/data/CMakeLists.txt
-===================================================================
---- a/dcmdata/data/CMakeLists.txt 2016-11-07 12:34:04.991034096 +0100
-+++ b/dcmdata/data/CMakeLists.txt 2016-11-07 12:34:04.987034145 +0100
+--- a/dcmdata/data/CMakeLists.txt
++++ b/dcmdata/data/CMakeLists.txt
@@ -1,2 +1,3 @@
# declare installation files
-INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
+INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
+INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
-Index: b/CMake/GenerateDCMTKConfigure.cmake
-===================================================================
---- a/CMake/GenerateDCMTKConfigure.cmake 2016-11-07 12:34:04.991034096 +0100
-+++ b/CMake/GenerateDCMTKConfigure.cmake 2016-11-07 12:34:28.000000000 +0100
-@@ -83,10 +83,10 @@
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -127,10 +127,10 @@
SET(ENVIRONMENT_PATH_SEPARATOR ";")
# Set dictionary path to the data dir inside install main dir (prefix)
IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
@@ -29,7 +25,7 @@ Index: b/CMake/GenerateDCMTKConfigure.cmake
ENDIF(ENABLE_PRIVATE_TAGS)
# Again, for Windows strip all / from path and replace it with \\.
STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
-@@ -104,10 +104,10 @@
+@@ -148,10 +148,10 @@
SET(ENVIRONMENT_PATH_SEPARATOR ":")
# Set dictionary path to the data dir inside install main dir (prefix).
if (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index a4020f6..b04375f 100644
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -17,11 +17,9 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
10 files changed, 610 insertions(+), 132 deletions(-)
create mode 100644 ofstd/include/dcmtk/ofstd/ofalign.h
-Index: b/CMake/osconfig.h.in
-===================================================================
---- a/CMake/osconfig.h.in 2016-11-07 12:34:05.083032955 +0100
-+++ b/CMake/osconfig.h.in 2016-11-07 12:34:05.011033847 +0100
-@@ -1132,4 +1132,7 @@
+--- a/CMake/osconfig.h.in
++++ b/CMake/osconfig.h.in
+@@ -1146,4 +1146,7 @@
/* The path on the Android device that should be used for temporary files */
#cmakedefine ANDROID_TEMPORARY_FILES_LOCATION "@ANDROID_TEMPORARY_FILES_LOCATION@"
@@ -29,10 +27,8 @@ Index: b/CMake/osconfig.h.in
+#cmakedefine HAVE_DECLSPEC_ALIGN
+
#endif /* !OSCONFIG_H*/
-Index: b/config/aclocal.m4
-===================================================================
---- a/config/aclocal.m4 2016-11-07 12:34:05.083032955 +0100
-+++ b/config/aclocal.m4 2016-11-07 12:34:05.043033451 +0100
+--- a/config/aclocal.m4
++++ b/config/aclocal.m4
@@ -1490,6 +1490,47 @@
fi
])
@@ -81,11 +77,9 @@ Index: b/config/aclocal.m4
dnl
dnl CHECK_VLA checks if the C Compiler supports variable-length arrays
-Index: b/config/configure
-===================================================================
---- a/config/configure 2016-11-07 12:34:05.083032955 +0100
-+++ b/config/configure 2016-11-07 12:34:05.067033154 +0100
-@@ -15004,6 +15004,66 @@
+--- a/config/configure
++++ b/config/configure
+@@ -15293,6 +15293,66 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -152,11 +146,9 @@ Index: b/config/configure
CFLAGS="$DEBUGCFLAGS $CFLAGS"
CXXFLAGS="$DEBUGCXXFLAGS $CXXFLAGS"
-Index: b/ofstd/tests/toption.cc
-===================================================================
---- a/ofstd/tests/toption.cc 2016-11-07 12:34:05.083032955 +0100
-+++ b/ofstd/tests/toption.cc 2016-11-07 12:34:05.083032955 +0100
-@@ -17,6 +17,11 @@
+--- a/ofstd/tests/toption.cc
++++ b/ofstd/tests/toption.cc
+@@ -38,6 +38,11 @@
OFoptional<int> o0( 3 ), o1, o2( OFnullopt );
diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch
index b350ea2..61fc8d7 100644
--- a/debian/patches/05_performance.patch
+++ b/debian/patches/05_performance.patch
@@ -4,10 +4,8 @@ Bug-Debian: http://bugs.debian.org/785400
Forwarded-Upstream: yes
Description: Fix a DCMTK performance problem
-Index: b/dcmnet/libsrc/dul.cc
-===================================================================
---- a/dcmnet/libsrc/dul.cc 2016-11-07 12:34:05.135032311 +0100
-+++ b/dcmnet/libsrc/dul.cc 2016-11-07 12:34:05.103032708 +0100
+--- a/dcmnet/libsrc/dul.cc
++++ b/dcmnet/libsrc/dul.cc
@@ -1789,7 +1789,7 @@
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
@@ -15,18 +13,16 @@ Index: b/dcmnet/libsrc/dul.cc
- setTCPBufferLength(sock);
+ //setTCPBufferLength(sock);
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
/*
-Index: b/dcmnet/libsrc/dulfsm.cc
-===================================================================
---- a/dcmnet/libsrc/dulfsm.cc 2016-11-07 12:34:05.135032311 +0100
-+++ b/dcmnet/libsrc/dulfsm.cc 2016-11-07 12:34:05.135032311 +0100
-@@ -2431,7 +2431,7 @@
+ * Disable the so-called Nagle algorithm (if requested).
+--- a/dcmnet/libsrc/dulfsm.cc
++++ b/dcmnet/libsrc/dulfsm.cc
+@@ -2419,7 +2419,7 @@
return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
}
#endif
- setTCPBufferLength(s);
+ //setTCPBufferLength(s);
- #ifndef DONT_DISABLE_NAGLE_ALGORITHM
/*
+ * Disable the so-called Nagle algorithm (if requested).
diff --git a/debian/patches/06_soversion_abi.patch b/debian/patches/06_soversion_abi.patch
index 8342e98..e293e58 100644
--- a/debian/patches/06_soversion_abi.patch
+++ b/debian/patches/06_soversion_abi.patch
@@ -2,10 +2,8 @@ Description: Add abi-version to library name
Author: Gert Wollny <gw.fossdev at gmail.com>
Last-Update: 2016-04-09
-Index: b/CMake/dcmtkPrepare.cmake
-===================================================================
---- a/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.159032014 +0100
-+++ b/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:28.000000000 +0100
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
@@ -56,7 +56,7 @@
#SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch
index f60c171..0bdbe79 100644
--- a/debian/patches/07_dont_export_all_executables.patch
+++ b/debian/patches/07_dont_export_all_executables.patch
@@ -7,10 +7,8 @@ Description: Don't add executables to cmake exports
Author: Gert Wollny <gw.fossdev at gmail.com>
Bug-Debian: http://bugs.debian.org/803304
-Index: b/CMake/dcmtkMacros.cmake
-===================================================================
---- a/CMake/dcmtkMacros.cmake 2016-11-07 12:34:05.215031320 +0100
-+++ b/CMake/dcmtkMacros.cmake 2016-11-07 12:34:05.211031369 +0100
+--- a/CMake/dcmtkMacros.cmake
++++ b/CMake/dcmtkMacros.cmake
@@ -55,11 +55,11 @@
ENDIF(WIN32 AND NOT MINGW)
diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
index 0c2a92b..22e7617 100644
--- a/debian/patches/08_remove_system_processor.patch
+++ b/debian/patches/08_remove_system_processor.patch
@@ -2,11 +2,9 @@ Description: Remove the systemprocessor name in the compilate
Required for reproducible builds, and it is also not reliable
Author: Gert Wollny <gw.fossdev at gmail.com>
-Index: b/CMake/GenerateDCMTKConfigure.cmake
-===================================================================
---- a/CMake/GenerateDCMTKConfigure.cmake 2016-11-07 12:34:05.287030428 +0100
-+++ b/CMake/GenerateDCMTKConfigure.cmake 2016-11-07 12:34:05.231031122 +0100
-@@ -64,15 +64,6 @@
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -108,15 +108,6 @@
# Configure file
@@ -22,11 +20,9 @@ Index: b/CMake/GenerateDCMTKConfigure.cmake
# Configure dictionary path and install prefix
IF(WIN32 AND NOT CYGWIN AND NOT MINGW)
# Set DCMTK_PREFIX needed within some code. Be sure that all / are replaced by \\.
-Index: b/CMake/dcmtkPrepare.cmake
-===================================================================
---- a/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.287030428 +0100
-+++ b/CMake/dcmtkPrepare.cmake 2016-11-07 12:34:05.231031122 +0100
-@@ -359,11 +359,6 @@
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
+@@ -360,11 +360,6 @@
OPTION(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
MARK_AS_ADVANCED(DCMTK_FORCE_FPIC_ON_UNIX)
@@ -38,10 +34,8 @@ Index: b/CMake/dcmtkPrepare.cmake
ENDIF(WIN32)
-Index: b/config/include/dcmtk/config/osconfig.h.in
-===================================================================
---- a/config/include/dcmtk/config/osconfig.h.in 2016-11-07 12:34:05.287030428 +0100
-+++ b/config/include/dcmtk/config/osconfig.h.in 2016-11-07 12:34:05.271030626 +0100
+--- a/config/include/dcmtk/config/osconfig.h.in
++++ b/config/include/dcmtk/config/osconfig.h.in
@@ -30,9 +30,6 @@
/* Define if __attribute__((aligned)) supports templates */
#undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES
@@ -52,10 +46,8 @@ Index: b/config/include/dcmtk/config/osconfig.h.in
/* Define if char is unsigned on the C compiler */
#undef C_CHAR_UNSIGNED
-Index: b/ofstd/libsrc/ofconapp.cc
-===================================================================
---- a/ofstd/libsrc/ofconapp.cc 2016-11-07 12:34:05.287030428 +0100
-+++ b/ofstd/libsrc/ofconapp.cc 2016-11-07 12:34:05.283030477 +0100
+--- a/ofstd/libsrc/ofconapp.cc
++++ b/ofstd/libsrc/ofconapp.cc
@@ -124,6 +124,9 @@
#endif // DCMTK_USE_WCHAR_T
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtk.git
More information about the debian-med-commit
mailing list