From owner-svn-ports-head@freebsd.org Mon Apr 8 11:51:16 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53699157D111; Mon, 8 Apr 2019 11:51:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EA4486D9B8; Mon, 8 Apr 2019 11:51:15 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C79F122EC7; Mon, 8 Apr 2019 11:51:15 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x38BpFP0044058; Mon, 8 Apr 2019 11:51:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38BpFKN044057; Mon, 8 Apr 2019 11:51:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201904081151.x38BpFKN044057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 8 Apr 2019 11:51:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498365 - head/security/botan2/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/security/botan2/files X-SVN-Commit-Revision: 498365 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EA4486D9B8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 11:51:16 -0000 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,