Date: Mon, 8 Apr 2019 11:51:15 +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: r498365 - head/security/botan2/files Message-ID: <201904081151.x38BpFKN044057@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Apr 8 11:51:15 2019 New Revision: 498365 URL: https://svnweb.freebsd.org/changeset/ports/498365 Log: security/botan2: unbreak with boost 1.70 PR: 237019 Submitted by: Ralf van der Enden Obtained from: upstream Added: head/security/botan2/files/ head/security/botan2/files/patch-boost-1.70 (contents, props changed) Added: head/security/botan2/files/patch-boost-1.70 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/botan2/files/patch-boost-1.70 Mon Apr 8 11:51:15 2019 (r498365) @@ -0,0 +1,51 @@ +boost 1.70 compatibility (accepted upstream) +https://github.com/randombit/botan/pull/1881 + +--- src/cli/tls_http_server.cpp.orig 2019-01-04 11:14:58 UTC ++++ src/cli/tls_http_server.cpp +@@ -41,6 +41,12 @@ + + #include "credentials.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif ++ + namespace Botan_CLI { + + namespace { +@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final + session::pointer make_session() + { + return session::create( +- m_acceptor.get_io_service(), ++ GET_IO_SERVICE(m_acceptor), + m_session_manager, + m_creds, + m_policy); +--- src/cli/tls_proxy.cpp.orig 2019-01-04 11:14:58 UTC ++++ src/cli/tls_proxy.cpp +@@ -33,6 +33,12 @@ + + #include "credentials.h" + ++#if BOOST_VERSION >= 107000 ++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) ++#else ++#define GET_IO_SERVICE(s) ((s).get_io_service()) ++#endif ++ + namespace Botan_CLI { + + namespace { +@@ -370,7 +376,7 @@ class tls_proxy_server final + session::pointer make_session() + { + return session::create( +- m_acceptor.get_io_service(), ++ GET_IO_SERVICE(m_acceptor), + m_session_manager, + m_creds, + m_policy,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904081151.x38BpFKN044057>