| 1 |
commit: 812f60f2b8ceea08fbf418c73e49059d0ee6a21f |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 16 20:27:43 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 16 20:28:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812f60f2 |
| 7 |
|
| 8 |
dev-libs/botan: fix >=dev-libs/boost-1.70.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=683376 |
| 11 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 13 |
|
| 14 |
dev-libs/botan/botan-2.9.0.ebuild | 4 ++ |
| 15 |
dev-libs/botan/files/botan-2.9.0-build.patch | 63 ++++++++++++++++++++++++++++ |
| 16 |
2 files changed, 67 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-libs/botan/botan-2.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild |
| 19 |
index 8f92905d738..4f995a89686 100644 |
| 20 |
--- a/dev-libs/botan/botan-2.9.0.ebuild |
| 21 |
+++ b/dev-libs/botan/botan-2.9.0.ebuild |
| 22 |
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND} |
| 23 |
BDEPEND="dev-lang/python:* |
| 24 |
doc? ( dev-python/sphinx )" |
| 25 |
|
| 26 |
+PATCHES=( |
| 27 |
+ "${FILESDIR}/${P}-build.patch" |
| 28 |
+) |
| 29 |
+ |
| 30 |
src_configure() { |
| 31 |
local disable_modules=() |
| 32 |
use boost || disable_modules+=( "boost" ) |
| 33 |
|
| 34 |
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch |
| 35 |
new file mode 100755 |
| 36 |
index 00000000000..6208ffdbf0a |
| 37 |
--- /dev/null |
| 38 |
+++ b/dev-libs/botan/files/botan-2.9.0-build.patch |
| 39 |
@@ -0,0 +1,63 @@ |
| 40 |
+From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001 |
| 41 |
+From: Ralf van der Enden <Ralf.vanderEnden@××××××××.nl> |
| 42 |
+Date: Fri, 5 Apr 2019 14:58:14 +0200 |
| 43 |
+Subject: [PATCH] boost 1.70 compatibility |
| 44 |
+ |
| 45 |
+Fixes issue #82 |
| 46 |
+--- |
| 47 |
+ src/cli/tls_http_server.cpp | 8 +++++++- |
| 48 |
+ src/cli/tls_proxy.cpp | 8 +++++++- |
| 49 |
+ 2 files changed, 14 insertions(+), 2 deletions(-) |
| 50 |
+ |
| 51 |
+diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp |
| 52 |
+index cc59a71c33..0a6428cd65 100644 |
| 53 |
+--- a/src/cli/tls_http_server.cpp |
| 54 |
++++ b/src/cli/tls_http_server.cpp |
| 55 |
+@@ -41,6 +41,12 @@ |
| 56 |
+ |
| 57 |
+ #include "credentials.h" |
| 58 |
+ |
| 59 |
++#if BOOST_VERSION >= 107000 |
| 60 |
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) |
| 61 |
++#else |
| 62 |
++#define GET_IO_SERVICE(s) ((s).get_io_service()) |
| 63 |
++#endif |
| 64 |
++ |
| 65 |
+ namespace Botan_CLI { |
| 66 |
+ |
| 67 |
+ namespace { |
| 68 |
+@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final |
| 69 |
+ session::pointer make_session() |
| 70 |
+ { |
| 71 |
+ return session::create( |
| 72 |
+- m_acceptor.get_io_service(), |
| 73 |
++ GET_IO_SERVICE(m_acceptor), |
| 74 |
+ m_session_manager, |
| 75 |
+ m_creds, |
| 76 |
+ m_policy); |
| 77 |
+diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp |
| 78 |
+index 49ffbe3766..42ce156b12 100644 |
| 79 |
+--- a/src/cli/tls_proxy.cpp |
| 80 |
++++ b/src/cli/tls_proxy.cpp |
| 81 |
+@@ -33,6 +33,12 @@ |
| 82 |
+ |
| 83 |
+ #include "credentials.h" |
| 84 |
+ |
| 85 |
++#if BOOST_VERSION >= 107000 |
| 86 |
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context()) |
| 87 |
++#else |
| 88 |
++#define GET_IO_SERVICE(s) ((s).get_io_service()) |
| 89 |
++#endif |
| 90 |
++ |
| 91 |
+ namespace Botan_CLI { |
| 92 |
+ |
| 93 |
+ namespace { |
| 94 |
+@@ -370,7 +376,7 @@ class tls_proxy_server final |
| 95 |
+ session::pointer make_session() |
| 96 |
+ { |
| 97 |
+ return session::create( |
| 98 |
+- m_acceptor.get_io_service(), |
| 99 |
++ GET_IO_SERVICE(m_acceptor), |
| 100 |
+ m_session_manager, |
| 101 |
+ m_creds, |
| 102 |
+ m_policy, |
Archives