Date: Thu, 18 Jan 2018 04:01:01 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459313 - in head/net-p2p/zetacoin: . files Message-ID: <201801180401.w0I411mY054901@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 18 04:01:01 2018 New Revision: 459313 URL: https://svnweb.freebsd.org/changeset/ports/459313 Log: net-p2p/zetacoin: unbreak with boost 1.66 PR: 224187 Submitted by: Daniel Morante (maintainer) Added: head/net-p2p/zetacoin/files/patch-src_bitcoin-cli.cpp (contents, props changed) head/net-p2p/zetacoin/files/patch-src_rpcserver.cpp (contents, props changed) Modified: head/net-p2p/zetacoin/Makefile (contents, props changed) Modified: head/net-p2p/zetacoin/Makefile ============================================================================== --- head/net-p2p/zetacoin/Makefile Thu Jan 18 02:51:39 2018 (r459312) +++ head/net-p2p/zetacoin/Makefile Thu Jan 18 04:01:01 2018 (r459313) @@ -4,7 +4,7 @@ PORTNAME= zetacoin PORTVERSION= 0.11.2.3 DISTVERSIONPREFIX= v -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net-p2p finance MAINTAINER= daniel@morante.net Added: head/net-p2p/zetacoin/files/patch-src_bitcoin-cli.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/zetacoin/files/patch-src_bitcoin-cli.cpp Thu Jan 18 04:01:01 2018 (r459313) @@ -0,0 +1,11 @@ +--- src/bitcoin-cli.cpp.orig 2018-01-13 04:55:52 UTC ++++ src/bitcoin-cli.cpp +@@ -105,7 +105,7 @@ Object CallRPC(const string& strMethod, + // Connect to localhost + bool fUseSSL = GetBoolArg("-rpcssl", false); + boost::asio::io_service io_service; +- boost::asio::ssl::context context(io_service, boost::asio::ssl::context::sslv23); ++ boost::asio::ssl::context context(boost::asio::ssl::context::sslv23); + context.set_options(boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::no_sslv3); + boost::asio::ssl::stream<boost::asio::ip::tcp::socket> sslStream(io_service, context); + SSLIOStreamDevice<boost::asio::ip::tcp> d(sslStream, fUseSSL); Added: head/net-p2p/zetacoin/files/patch-src_rpcserver.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/zetacoin/files/patch-src_rpcserver.cpp Thu Jan 18 04:01:01 2018 (r459313) @@ -0,0 +1,62 @@ +--- src/rpcserver.cpp.orig 2018-01-10 23:24:05 UTC ++++ src/rpcserver.cpp +@@ -492,8 +492,8 @@ private: + void ServiceConnection(AcceptedConnection *conn); + + //! Forward declaration required for RPCListen +-template <typename Protocol, typename SocketAcceptorService> +-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor, ++template <typename Protocol> ++static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor, + ssl::context& context, + bool fUseSSL, + boost::shared_ptr< AcceptedConnection > conn, +@@ -502,8 +502,8 @@ static void RPCAcceptHandler(boost::shar + /** + * Sets up I/O resources to accept and handle a new connection. + */ +-template <typename Protocol, typename SocketAcceptorService> +-static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor, ++template <typename Protocol> ++static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor, + ssl::context& context, + const bool fUseSSL) + { +@@ -513,7 +513,7 @@ static void RPCListen(boost::shared_ptr< + acceptor->async_accept( + conn->sslStream.lowest_layer(), + conn->peer, +- boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>, ++ boost::bind(&RPCAcceptHandler<Protocol>, + acceptor, + boost::ref(context), + fUseSSL, +@@ -525,8 +525,8 @@ static void RPCListen(boost::shared_ptr< + /** + * Accept and handle incoming connection. + */ +-template <typename Protocol, typename SocketAcceptorService> +-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor, ++template <typename Protocol> ++static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor, + ssl::context& context, + const bool fUseSSL, + boost::shared_ptr< AcceptedConnection > conn, +@@ -620,7 +620,7 @@ void StartRPCThreads() + + assert(rpc_io_service == NULL); + rpc_io_service = new boost::asio::io_service(); +- rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23); ++ rpc_ssl_context = new ssl::context(ssl::context::sslv23); + + const bool fUseSSL = GetBoolArg("-rpcssl", false); + +@@ -639,7 +639,7 @@ void StartRPCThreads() + else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string()); + + string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH"); +- SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str()); ++ SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str()); + } + + std::vector<ip::tcp::endpoint> vEndpoints;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801180401.w0I411mY054901>