From b1d3a1cc991d37879a6c8a66c684cd5ae5cd3eace61845956f3b5cec11b1ceb6 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 13 Aug 2019 13:25:08 +0000 Subject: [PATCH] - Update to version 1.39.1: * This release fixes the bug that log-level is not set with cmd-line or configuration file. It also fixes FPE with default backend. - Changes for version 1.39.0: * libnghttp2 now ignores content-length in 200 response to CONNECT request as per RFC 7230. * mruby has been upgraded to 2.0.1. * libnghttp2-asio now supports boost-1.70. * http-parser has been replaced with llhttp. * nghttpx now ignores Content-Length and Transfer-Encoding in 1xx or 200 to CONNECT. - Drop no longer needed boost170.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=94 --- boost170.patch | 50 ------------------------------- nghttp2-1.38.0.tar.xz | 3 -- nghttp2-1.39.1.tar.xz | 3 ++ nghttp2-remove-python-build.patch | 6 ++-- nghttp2.changes | 17 +++++++++++ nghttp2.spec | 4 +-- 6 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 boost170.patch delete mode 100644 nghttp2-1.38.0.tar.xz create mode 100644 nghttp2-1.39.1.tar.xz diff --git a/boost170.patch b/boost170.patch deleted file mode 100644 index 7ce2a3c..0000000 --- a/boost170.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= -Date: Thu, 18 Apr 2019 12:35:54 +0200 -Subject: [PATCH] asio: support boost-1.70 - -In boost 1.70, deprecated get_io_context() has finally been removed. -Introduce GET_IO_SERVICE macro that based on boost version uses -old get_io_service() interface (boost < 1.70), or get_executor().context() -for boost 1.70+. - -Commit based idea seen in monero-project/monero@17769db9462e5201befcb05f86ccbaeabf35caf8 ---- - src/asio_server_connection.h | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/asio_server_connection.h b/src/asio_server_connection.h -index 6be794060..56924c71a 100644 ---- a/src/asio_server_connection.h -+++ b/src/asio_server_connection.h -@@ -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 @@ class connection : public std::enable_shared_from_this>, - SocketArgs &&... args) - : socket_(std::forward(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 @@ class connection : public std::enable_shared_from_this>, - boost::system::error_code ec; - - handler_ = std::make_shared( -- 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(); diff --git a/nghttp2-1.38.0.tar.xz b/nghttp2-1.38.0.tar.xz deleted file mode 100644 index 3f66b8e..0000000 --- a/nghttp2-1.38.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef75c761858241c6b4372fa6397aa0481a984b84b7b07c4ec7dc2d7b9eee87f8 -size 1628356 diff --git a/nghttp2-1.39.1.tar.xz b/nghttp2-1.39.1.tar.xz new file mode 100644 index 0000000..32a60f3 --- /dev/null +++ b/nghttp2-1.39.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:679160766401f474731fd60c3aca095f88451e3cc4709b72306e4c34cf981448 +size 1634512 diff --git a/nghttp2-remove-python-build.patch b/nghttp2-remove-python-build.patch index d398abf..b7f2594 100644 --- a/nghttp2-remove-python-build.patch +++ b/nghttp2-remove-python-build.patch @@ -1,7 +1,7 @@ -Index: nghttp2-1.24.0/python/Makefile.am +Index: nghttp2-1.39.1/python/Makefile.am =================================================================== ---- nghttp2-1.24.0.orig/python/Makefile.am -+++ nghttp2-1.24.0/python/Makefile.am +--- nghttp2-1.39.1.orig/python/Makefile.am ++++ nghttp2-1.39.1/python/Makefile.am @@ -29,16 +29,6 @@ EXTRA_DIST = cnghttp2.pxd nghttp2.pyx CM if ENABLE_PYTHON_BINDINGS diff --git a/nghttp2.changes b/nghttp2.changes index c863179..11c2836 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Aug 13 13:22:01 UTC 2019 - Martin Pluskal + +- Update to version 1.39.1: + * This release fixes the bug that log-level is not set with + cmd-line or configuration file. It also fixes FPE with default + backend. +- Changes for version 1.39.0: + * libnghttp2 now ignores content-length in 200 response to + CONNECT request as per RFC 7230. + * mruby has been upgraded to 2.0.1. + * libnghttp2-asio now supports boost-1.70. + * http-parser has been replaced with llhttp. + * nghttpx now ignores Content-Length and Transfer-Encoding in 1xx + or 200 to CONNECT. +- Drop no longer needed boost170.patch + ------------------------------------------------------------------- Fri May 10 08:24:23 UTC 2019 - Tomáš Chvátal diff --git a/nghttp2.spec b/nghttp2.spec index 9edc206..d203365 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -29,7 +29,7 @@ %bcond_with python %endif Name: nghttp2%{psuffix} -Version: 1.38.0 +Version: 1.39.1 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT @@ -39,7 +39,6 @@ Source: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{vers Source1: baselibs.conf # PATCH-FIX-OPENSUSE nghttp2-remove-python-build.patch Patch0: nghttp2-remove-python-build.patch -Patch1: boost170.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -133,7 +132,6 @@ HTTP/2 client, server and proxy. %prep %setup -q -n nghttp2-%{version} %patch0 -p1 -%patch1 -p1 # fix python shebang sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python3:g' script/fetch-ocsp-response