[69553] trunk/dports/graphics/dcmtk

[ryandesign at macports.org]

Revision: 69553
          http://trac.macports.org/changeset/69553
Author:   ryandesign at macports.org
Date:     2010-07-09 17:05:53 -0700 (Fri, 09 Jul 2010)
Log Message:
-----------
dcmtk: openssl 1.0.0 compatibility; see #25608

Modified Paths:
--------------
    trunk/dports/graphics/dcmtk/Portfile

Added Paths:
-----------
    trunk/dports/graphics/dcmtk/files/patch-openssl-1.0.0.diff

Modified: trunk/dports/graphics/dcmtk/Portfile
===================================================================
--- trunk/dports/graphics/dcmtk/Portfile	2010-07-09 20:25:46 UTC (rev 69552)
+++ trunk/dports/graphics/dcmtk/Portfile	2010-07-10 00:05:53 UTC (rev 69553)
@@ -54,6 +54,9 @@
 # Darwin 9+10 compatibility, see http://forum.dcmtk.org/viewtopic.php?t=1372
 patchfiles                  patch-config-configure.in.diff
 
+# OpenSSL 1.0.0 compatibility fix
+patchfiles-append           patch-openssl-1.0.0.diff
+
 post-patch {
     # After patching config/configure.in, autotools have to be run again.
     # Usually, we would system "cd ${worksrcpath}/config && ./autoall" here,

Added: trunk/dports/graphics/dcmtk/files/patch-openssl-1.0.0.diff
===================================================================
--- trunk/dports/graphics/dcmtk/files/patch-openssl-1.0.0.diff	                        (rev 0)
+++ trunk/dports/graphics/dcmtk/files/patch-openssl-1.0.0.diff	2010-07-10 00:05:53 UTC (rev 69553)
@@ -0,0 +1,28 @@
+Upstream patch from 2009-12-18 to fix compilation with OpenSSL 1.0.0
+--- dcmtls/libsrc/tlslayer.cc.orig	2009-01-30 07:53:53.000000000 -0600
++++ dcmtls/libsrc/tlslayer.cc	2009-12-18 07:15:45.000000000 -0600
+@@ -189,18 +197,12 @@
+    seedPRNG(randFile);
+ 
+-   SSL_METHOD *method = NULL;
+-   switch (networkRole)
++   if (networkRole == DICOM_APPLICATION_ACCEPTOR)
+    {
+-     case DICOM_APPLICATION_ACCEPTOR: 
+-       method = TLSv1_server_method();
+-       break;
+-     case DICOM_APPLICATION_REQUESTOR:
+-       method = TLSv1_client_method();
+-       break;
+-     default:
+-       method = TLSv1_method();
+-       break;
++     transportLayerContext = SSL_CTX_new(TLSv1_server_method());
++   } else if (networkRole == DICOM_APPLICATION_REQUESTOR) {
++     transportLayerContext = SSL_CTX_new(TLSv1_client_method());
++   } else {
++     transportLayerContext = SSL_CTX_new(TLSv1_method());
+    }
+-   transportLayerContext = SSL_CTX_new(method);
+ 
+ #ifdef DEBUG
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100709/1ef562fa/attachment.html>