From owner-svn-ports-all@freebsd.org Fri Apr 19 23:26:18 2019 Return-Path: Delivered-To: svn-ports-all@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 77A52157BCFE; Fri, 19 Apr 2019 23:26:18 +0000 (UTC) (envelope-from sunpoet@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 188B8703DE; Fri, 19 Apr 2019 23:26:18 +0000 (UTC) (envelope-from sunpoet@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 27A8B5A12; Fri, 19 Apr 2019 23:26:16 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3JNQGYg022070; Fri, 19 Apr 2019 23:26:16 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3JNQFhA022068; Fri, 19 Apr 2019 23:26:15 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201904192326.x3JNQFhA022068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 19 Apr 2019 23:26:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499399 - in head/www/nghttp2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/www/nghttp2: . files X-SVN-Commit-Revision: 499399 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 188B8703DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,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-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Apr 2019 23:26:18 -0000 Author: sunpoet Date: Fri Apr 19 23:26:15 2019 New Revision: 499399 URL: https://svnweb.freebsd.org/changeset/ports/499399 Log: Move upstream patch to files directory Obtained from: https://github.com/nghttp2/nghttp2/commit/cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 Added: head/www/nghttp2/files/patch-src-asio_server_connection.h (contents, props changed) Modified: head/www/nghttp2/Makefile Modified: head/www/nghttp2/Makefile ============================================================================== --- head/www/nghttp2/Makefile Fri Apr 19 23:26:10 2019 (r499398) +++ head/www/nghttp2/Makefile Fri Apr 19 23:26:15 2019 (r499399) @@ -6,9 +6,6 @@ PORTVERSION= 1.38.0 DISTVERSIONPREFIX= v CATEGORIES= www net -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= cbba1ebf8fce.patch:-p1 - MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library Added: head/www/nghttp2/files/patch-src-asio_server_connection.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nghttp2/files/patch-src-asio_server_connection.h Fri Apr 19 23:26:15 2019 (r499399) @@ -0,0 +1,35 @@ +Obtained from: https://github.com/nghttp2/nghttp2/commit/cbba1ebf8fcecb24392f0cc07b1235b17d0de9d8 + +--- src/asio_server_connection.h.orig 2019-04-18 06:08:36 UTC ++++ 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 @@ public: + 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 @@ public: + 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();