diff options
Diffstat (limited to '0005-boost-patch-by-unixbrain.patch')
| -rw-r--r-- | 0005-boost-patch-by-unixbrain.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/0005-boost-patch-by-unixbrain.patch b/0005-boost-patch-by-unixbrain.patch new file mode 100644 index 000000000000..c37c193074d8 --- /dev/null +++ b/0005-boost-patch-by-unixbrain.patch @@ -0,0 +1,75 @@ +diff -ura dogecoin-1.10.0/src/bitcoin-cli.cpp dogecoin-1.10.0-b/src/bitcoin-cli.cpp +--- dogecoin-1.10.0/src/bitcoin-cli.cpp 2015-10-31 10:49:41.000000000 -0400 ++++ dogecoin-1.10.0-b/src/bitcoin-cli.cpp 2018-02-06 01:23:36.244774559 -0500 +@@ -105,7 +105,7 @@ + // 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); +diff -ura dogecoin-1.10.0/src/rpcserver.cpp dogecoin-1.10.0-b/src/rpcserver.cpp +--- dogecoin-1.10.0/src/rpcserver.cpp 2015-10-31 10:49:41.000000000 -0400 ++++ dogecoin-1.10.0-b/src/rpcserver.cpp 2018-02-06 01:04:33.034848733 -0500 +@@ -503,8 +503,8 @@ + 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, +@@ -513,8 +513,8 @@ + /** + * 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) + { +@@ -524,7 +524,7 @@ + acceptor->async_accept( + conn->sslStream.lowest_layer(), + conn->peer, +- boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>, ++ boost::bind(&RPCAcceptHandler<Protocol>, + acceptor, + boost::ref(context), + fUseSSL, +@@ -536,8 +536,8 @@ + /** + * 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, +@@ -631,7 +631,7 @@ + + 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); + +@@ -650,7 +650,7 @@ + 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; |