From owner-svn-ports-all@freebsd.org Fri Sep 9 13:05:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8469BBD2BCB; Fri, 9 Sep 2016 13:05:54 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D6FBA55; Fri, 9 Sep 2016 13:05:54 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u89D5rkx087173; Fri, 9 Sep 2016 13:05:53 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u89D5r98087169; Fri, 9 Sep 2016 13:05:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609091305.u89D5r98087169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 9 Sep 2016 13:05:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421614 - in head/net/Sockets: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Sep 2016 13:05:54 -0000 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(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(meth)); + SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE); + // session id