svn commit: r421614 - in head/net/Sockets: . files
John Marino
marino at FreeBSD.org
Fri Sep 9 13:05:54 UTC 2016
Author: marino
Date: Fri Sep 9 13:05:53 2016
New Revision: 421614
URL: https://svnweb.freebsd.org/changeset/ports/421614
Log:
net/Sockets: USES+=ssl, Fix SSLv3, set CFLAGS, honor LDFLAGS
Approved by: SSL blanket
Added:
head/net/Sockets/files/patch-TcpSocket.cpp (contents, props changed)
Modified:
head/net/Sockets/Makefile
head/net/Sockets/files/Makefile.Defines.freebsd
Modified: head/net/Sockets/Makefile
==============================================================================
--- head/net/Sockets/Makefile Fri Sep 9 13:04:35 2016 (r421613)
+++ head/net/Sockets/Makefile Fri Sep 9 13:05:53 2016 (r421614)
@@ -18,10 +18,11 @@ COMMENT= C++ wrapper for BSD-style socke
#CFLAGS+= -I${LOCALBASE}/include
#LDFLAGS+= -L${LOCALBASE}/lib
-USES+= gmake
+USES+= gmake ssl
USE_GNOME= libxml2
-USE_OPENSSL= yes
USE_LDCONFIG= yes
+CFLAGS+= -I${OPENSSLINC}
+LDFLAGS+= -L${OPENSSLLIB}
ALL_TARGET= all shared
INSTALL_TARGET= install_shared
Modified: head/net/Sockets/files/Makefile.Defines.freebsd
==============================================================================
--- head/net/Sockets/files/Makefile.Defines.freebsd Fri Sep 9 13:04:35 2016 (r421613)
+++ head/net/Sockets/files/Makefile.Defines.freebsd Fri Sep 9 13:05:53 2016 (r421614)
@@ -9,6 +9,7 @@ CFLAGS += -fPIC
OBJS += Semaphore.o
-LDFLAGSSO = -shared \
+LDFLAGSSO = $(LDFLAGS) \
+ -shared \
-Wl,-lssl \
-Wl,-h$(SONAME)
Added: head/net/Sockets/files/patch-TcpSocket.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/Sockets/files/patch-TcpSocket.cpp Fri Sep 9 13:05:53 2016 (r421614)
@@ -0,0 +1,20 @@
+--- TcpSocket.cpp.orig 2012-09-08 06:47:13 UTC
++++ TcpSocket.cpp
+@@ -1283,7 +1283,7 @@ void TcpSocket::InitializeContext(const
+ /* Create our context*/
+ if (m_client_contexts.find(context) == m_client_contexts.end())
+ {
+- const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
++ const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
+ m_ssl_ctx = m_client_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
+ SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
+ }
+@@ -1339,7 +1339,7 @@ void TcpSocket::InitializeContext(const
+ /* Create our context*/
+ if (m_server_contexts.find(context) == m_server_contexts.end())
+ {
+- const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
++ const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
+ m_ssl_ctx = m_server_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
+ SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
+ // session id
More information about the svn-ports-all
mailing list