[76742] trunk/dports/devel/libsockets

ryandesign at macports.org ryandesign at macports.org
Mon Mar 7 01:22:19 PST 2011


Revision: 76742
          http://trac.macports.org/changeset/76742
Author:   ryandesign at macports.org
Date:     2011-03-07 01:22:19 -0800 (Mon, 07 Mar 2011)
Log Message:
-----------
libsockets: fix build with openssl 1.0.0; see #28595 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/devel/libsockets/Portfile

Added Paths:
-----------
    trunk/dports/devel/libsockets/files/patch-TcpSocket.diff

Modified: trunk/dports/devel/libsockets/Portfile
===================================================================
--- trunk/dports/devel/libsockets/Portfile	2011-03-07 09:19:17 UTC (rev 76741)
+++ trunk/dports/devel/libsockets/Portfile	2011-03-07 09:22:19 UTC (rev 76742)
@@ -18,7 +18,7 @@
 				Sockets-${version}.tar.gz:tar
 checksums		uuid.h sha1 c466612c98aea27d92423589018e1a69d480c793 \
 				Sockets-${version}.tar.gz sha1 1344dcfcfd3cac4f28f041c9d8a0bcf5f4c3bab9
-patchfiles		patch-Makefile.diff patch-Makefile.Defines.macosx.diff
+patchfiles		patch-Makefile.diff patch-Makefile.Defines.macosx.diff patch-TcpSocket.diff
 
 depends_lib		port:openssl
 

Added: trunk/dports/devel/libsockets/files/patch-TcpSocket.diff
===================================================================
--- trunk/dports/devel/libsockets/files/patch-TcpSocket.diff	                        (rev 0)
+++ trunk/dports/devel/libsockets/files/patch-TcpSocket.diff	2011-03-07 09:22:19 UTC (rev 76742)
@@ -0,0 +1,48 @@
+--- TcpSocket.cpp.orig
++++ TcpSocket.cpp
+@@ -1234,14 +1234,14 @@ void TcpSocket::InitSSLServer()
+ }
+ 
+ 
+-void TcpSocket::InitializeContext(const std::string& context, SSL_METHOD *meth_in)
++void TcpSocket::InitializeContext(const std::string& context, const SSL_METHOD *meth_in)
+ {
+ 	static Mutex mutex;
+ 	Lock lock(mutex);
+ 	/* Create our context*/
+ 	if (m_client_contexts.find(context) == m_client_contexts.end())
+ 	{
+-		SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
++		const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
+ 		m_ssl_ctx = m_client_contexts[context] = SSL_CTX_new(meth);
+ 		SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY);
+ 	}
+@@ -1258,7 +1258,7 @@ void TcpSocket::InitializeContext(const std::string& context,const std::string&
+ 	/* Create our context*/
+ 	if (m_server_contexts.find(context) == m_server_contexts.end())
+ 	{
+-		SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
++		const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
+ 		m_ssl_ctx = m_server_contexts[context] = SSL_CTX_new(meth);
+ 		SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY);
+ 		// session id
+@@ -1294,7 +1294,7 @@ void TcpSocket::InitializeContext(const std::string& context,const std::string&
+ 	/* Create our context*/
+ 	if (m_server_contexts.find(context) == m_server_contexts.end())
+ 	{
+-		SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
++		const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
+ 		m_ssl_ctx = m_server_contexts[context] = SSL_CTX_new(meth);
+ 		SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY);
+ 		// session id
+--- TcpSocket.h.orig
++++ TcpSocket.h
+@@ -271,7 +271,7 @@ protected:
+ #ifdef HAVE_OPENSSL
+ 	/** SSL; Initialize ssl context for a client socket. 
+ 		\param meth_in SSL method */
+-	void InitializeContext(const std::string& context, SSL_METHOD *meth_in = NULL);
++	void InitializeContext(const std::string& context, const SSL_METHOD *meth_in = NULL);
+ 	/** SSL; Initialize ssl context for a server socket. 
+ 		\param keyfile Combined private key/certificate file 
+ 		\param password Password for private key 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110307/b1b4b2a0/attachment.html>


More information about the macports-changes mailing list