[med-svn] [Git][med-team/orthanc][master] 3 commits: fix build against DCMTK 3.6.7

[Sebastien Jodogne (@jodogne-guest)]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc


Commits:
3a22d6b7 by jodogne-guest at 2022-05-04T16:27:56+02:00
fix build against DCMTK 3.6.7

- - - - -
2e89b211 by jodogne-guest at 2022-05-04T16:38:53+02:00
cont

- - - - -
738fb356 by jodogne-guest at 2022-05-04T16:48:06+02:00
cont

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/dcmtk-3.6.7
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc (1.10.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Fix build against DCMTK 3.6.7. Closes: #1010554
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Wed, 04 May 2022 16:26:36 +0200
+
 orthanc (1.10.1+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/dcmtk-3.6.7
=====================================
@@ -0,0 +1,53 @@
+Description: Fix build against DCMTK 3.6.7
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.10.1/OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp
+===================================================================
+--- Orthanc-1.10.1.orig/OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp
++++ Orthanc-1.10.1/OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp
+@@ -107,19 +107,19 @@ namespace Orthanc
+         new DcmTLSTransportLayer(tmpRole /*opt_networkRole*/, NULL /*opt_readSeedFile*/,
+                                  OFFalse /*initializeOpenSSL, done by Orthanc::Toolbox::InitializeOpenSsl()*/));
+ 
+-      if (tls->addTrustedCertificateFile(trustedCertificatesPath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/) != TCS_ok)
++      if (!tls->addTrustedCertificateFile(trustedCertificatesPath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/).good())
+       {
+         throw OrthancException(ErrorCode_BadFileFormat, "Cannot parse PEM file with trusted certificates for DICOM TLS: " +
+                                trustedCertificatesPath);
+       }
+ 
+-      if (tls->setPrivateKeyFile(ownPrivateKeyPath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/) != TCS_ok)
++      if (!tls->setPrivateKeyFile(ownPrivateKeyPath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/).good())
+       {
+         throw OrthancException(ErrorCode_BadFileFormat, "Cannot parse PEM file with private key for DICOM TLS: " +
+                                ownPrivateKeyPath);
+       }
+ 
+-      if (tls->setCertificateFile(ownCertificatePath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/) != TCS_ok)
++      if (!tls->setCertificateFile(ownCertificatePath.c_str(), DCF_Filetype_PEM /*opt_keyFileFormat*/).good())
+       {
+         throw OrthancException(ErrorCode_BadFileFormat, "Cannot parse PEM file with own certificate for DICOM TLS: " +
+                                ownCertificatePath);
+@@ -132,18 +132,18 @@ namespace Orthanc
+       }
+ 
+ #if DCMTK_VERSION_NUMBER >= 364
+-      if (tls->setTLSProfile(TSP_Profile_BCP195 /*opt_tlsProfile*/) != TCS_ok)
++      if (!tls->setTLSProfile(TSP_Profile_BCP195 /*opt_tlsProfile*/).good())
+       {
+         throw OrthancException(ErrorCode_InternalError, "Cannot set the DICOM TLS profile");
+       }
+     
+-      if (tls->activateCipherSuites())
++      if (!tls->activateCipherSuites().good())
+       {
+         throw OrthancException(ErrorCode_InternalError, "Cannot activate the cipher suites for DICOM TLS");
+       }
+ #else
+       CLOG(INFO, DICOM) << "Using the following cipher suites for DICOM TLS: " << opt_ciphersuites;
+-      if (tls->setCipherSuites(opt_ciphersuites.c_str()) != TCS_ok)
++      if (!tls->setCipherSuites(opt_ciphersuites.c_str()).good())
+       {
+         throw OrthancException(ErrorCode_InternalError, "Unable to set cipher suites to: " + opt_ciphersuites);
+       }


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+dcmtk-3.6.7


=====================================
debian/rules
=====================================
@@ -36,7 +36,7 @@ CMAKE_EXTRA_FLAGS_SERVER += \
 CMAKE_EXTRA_FLAGS_STATIC_FRAMEWORK += \
 	-DORTHANC_INSTALL_PREFIX:PATH=. \
 	-DBUILD_SHARED_LIBRARY=OFF \
-	"-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=uuid curl civetweb lua5.3 boost_iostreams boost_locale dcmjpls dcmjpeg"
+	"-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=uuid curl civetweb lua5.3 boost_iostreams boost_locale ofstd png jpeg z crypto"
 
 CMAKE_EXTRA_FLAGS_SHARED_FRAMEWORK += \
 	-DORTHANC_INSTALL_PREFIX:PATH=. \



View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/e19ef4d9088a6e362f8ec35ec87ce36062963988...738fb3567e28d7da130f1ea57be0126e3290e50c

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/e19ef4d9088a6e362f8ec35ec87ce36062963988...738fb3567e28d7da130f1ea57be0126e3290e50c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220504/c5ebeb7f/attachment-0001.htm>