diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2019-04-08 11:51:15 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2019-04-08 11:51:15 +0000 |
commit | 71ef73c4f22074f4138582a36a73054385bdd210 (patch) | |
tree | a0c008a3d6e0b4b858260c0a294172c6fb000fd3 /security/botan2 | |
parent | 6eb03dd651296bc0aeb311387d9c7e6ae2949cc1 (diff) | |
download | ports-71ef73c4f22074f4138582a36a73054385bdd210.tar.gz ports-71ef73c4f22074f4138582a36a73054385bdd210.zip |
security/botan2: unbreak with boost 1.70
PR: 237019
Submitted by: Ralf van der Enden
Obtained from: upstream
Notes
Notes:
svn path=/head/; revision=498365
Diffstat (limited to 'security/botan2')
-rw-r--r-- | security/botan2/files/patch-boost-1.70 | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/security/botan2/files/patch-boost-1.70 b/security/botan2/files/patch-boost-1.70 new file mode 100644 index 000000000000..055854e2d931 --- /dev/null +++ b/security/botan2/files/patch-boost-1.70 @@ -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, |