[packages/nghttp2] - release 2, rebuild against boost 1.70

[adamg]

commit 108cddf1f67b7d5e9c9271d4f0934b306689223e
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Thu Apr 18 11:10:32 2019 +0200

    - release 2, rebuild against boost 1.70

 nghttp2-boost-1.70.patch | 33 +++++++++++++++++++++++++++++++++
 nghttp2.spec             |  4 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/nghttp2.spec b/nghttp2.spec
index 67f1dce..e829ab7 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -9,7 +9,7 @@ Summary:	HTTP/2.0 C library
 Summary(pl.UTF-8):	Biblioteka C HTTP/2.0
 Name:		nghttp2
 Version:	1.37.0
-Release:	1
+Release:	2
 License:	MIT
 Group:		Libraries
 #Source0Download: https://github.com/nghttp2/nghttp2/releases
@@ -17,6 +17,7 @@ Source0:	https://github.com/nghttp2/nghttp2/releases/download/v%{version}/%{name
 # Source0-md5:	dc7536d02aa7d4883c20eaf637747381
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-python.patch
+Patch2:		%{name}-boost-1.70.patch
 URL:		https://nghttp2.org/
 %{?with_tests:BuildRequires:	CUnit >= 2.1}
 BuildRequires:	autoconf >= 2.61
@@ -155,6 +156,7 @@ Statyczna biblioteka libnghttp2_asio.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' script/fetch-ocsp-response
 
diff --git a/nghttp2-boost-1.70.patch b/nghttp2-boost-1.70.patch
new file mode 100644
index 0000000..b1624be
--- /dev/null
+++ b/nghttp2-boost-1.70.patch
@@ -0,0 +1,33 @@
+--- nghttp2-1.37.0/src/asio_server_connection.h~	2019-04-18 08:06:45.000000000 +0200
++++ nghttp2-1.37.0/src/asio_server_connection.h	2019-04-18 10:41:33.966806171 +0200
+@@ -51,6 +51,12 @@
+ #include "util.h"
+ #include "template.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 nghttp2 {
+ 
+ namespace asio_http2 {
+@@ -71,7 +77,7 @@
+       SocketArgs &&... args)
+       : socket_(std::forward<SocketArgs>(args)...),
+         mux_(mux),
+-        deadline_(socket_.get_io_service()),
++        deadline_(GET_IO_SERVICE(socket_)),
+         tls_handshake_timeout_(tls_handshake_timeout),
+         read_timeout_(read_timeout),
+         writing_(false),
+@@ -82,7 +88,7 @@
+     boost::system::error_code ec;
+ 
+     handler_ = std::make_shared<http2_handler>(
+-        socket_.get_io_service(), socket_.lowest_layer().remote_endpoint(ec),
++        GET_IO_SERVICE(socket_), socket_.lowest_layer().remote_endpoint(ec),
+         [this]() { do_write(); }, mux_);
+     if (handler_->start() != 0) {
+       stop();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nghttp2.git/commitdiff/108cddf1f67b7d5e9c9271d4f0934b306689223e