Index: head/www/nghttp2/Makefile =================================================================== --- head/www/nghttp2/Makefile (revision 504103) +++ head/www/nghttp2/Makefile (revision 504104) @@ -1,79 +1,79 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.38.0 +PORTVERSION= 1.39.1 DISTVERSIONPREFIX= v CATEGORIES= www net MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libnghttp2>=${PORTVERSION}:www/libnghttp2 LIB_DEPENDS= libnghttp2.so:www/libnghttp2 OPTIONS_DEFINE= APP ASIO DOCS EXAMPLES HPACK OPTIONS_DEFAULT=APP HPACK OPTIONS_SUB= yes APP_DESC= Build h2load, nghttp, nghttpd and nghttpx USES= autoreconf compiler:c++14-lang gmake libtool localbase pathfix pkgconfig ssl CONFIGURE_ARGS= --disable-python-bindings --with-jemalloc CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_CXXSTD= c++14 USE_LDCONFIG= yes USE_RC_SUBR= nghttpx PORTDATA= fetch-ocsp-response PORTDOCS= * PORTEXAMPLES= * USE_GITHUB= yes APP_BUILD_DEPENDS= c-ares>=1.7.5:dns/c-ares \ libev>=4.11:devel/libev APP_CONFIGURE_ENABLE= app APP_CONFIGURE_OFF= --without-libxml2 APP_LIB_DEPENDS= libcares.so:dns/c-ares \ libev.so:devel/libev APP_USE= GNOME=libxml2 APP_USES= gnome ASIO_BUILD_DEPENDS= boost-libs>=1.54.0:devel/boost-libs ASIO_CONFIGURE_OFF= --with-boost=no ASIO_CONFIGURE_ON= --enable-asio-lib --with-boost-asio --with-boost-system --with-boost-thread ASIO_LIB_DEPENDS= libboost_thread.so:devel/boost-libs EXAMPLES_CONFIGURE_ENABLE= examples EXAMPLES_BUILD_DEPENDS= libevent>=2.0.8:devel/libevent EXAMPLES_LIB_DEPENDS= libevent_openssl.so:devel/libevent HPACK_BUILD_DEPENDS= jansson>=2.5:devel/jansson HPACK_CONFIGURE_ENABLE= hpack-tools HPACK_LIB_DEPENDS= libjansson.so:devel/jansson post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| lib||' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|$$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' ${WRKSRC}/*/Makefile.am @${REINPLACE_CMD} -e '1d' ${WRKSRC}/script/fetch-ocsp-response # lib/libnghttp2.* are not available until configure phase post-configure: @${MKDIR} ${WRKSRC}/lib/.libs/ @${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/ @cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/ ${INSTALL_DATA} ${FILESDIR}/nghttpx.conf.sample ${STAGEDIR}${PREFIX}/etc/nghttpx/nghttpx.conf.sample post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/examples/*.c* ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/examples/ && ${INSTALL_PROGRAM} client deflate libevent-client libevent-server ${STAGEDIR}${EXAMPLESDIR}/ .include Index: head/www/nghttp2/distinfo =================================================================== --- head/www/nghttp2/distinfo (revision 504103) +++ head/www/nghttp2/distinfo (revision 504104) @@ -1,5 +1,3 @@ -TIMESTAMP = 1555604318 -SHA256 (nghttp2-nghttp2-v1.38.0_GH0.tar.gz) = 3d5f1642e571470bb23a2a58b3d26ea9612c4e65195b99e55fc76999d3a9d306 -SIZE (nghttp2-nghttp2-v1.38.0_GH0.tar.gz) = 1770767 -SHA256 (cbba1ebf8fce.patch) = 3ea8be7174759810bdc6108e80d301ce7fa6b18c822a1f87b5741b247c2bb673 -SIZE (cbba1ebf8fce.patch) = 1950 +TIMESTAMP = 1560418062 +SHA256 (nghttp2-nghttp2-v1.39.1_GH0.tar.gz) = 4eca2520da3a80cf01d8abb8e6483f70229b9f4e0c9b6dbdd67435c655526d66 +SIZE (nghttp2-nghttp2-v1.39.1_GH0.tar.gz) = 1748667 Index: head/www/nghttp2/files/patch-src-asio_server_connection.h =================================================================== --- head/www/nghttp2/files/patch-src-asio_server_connection.h (revision 504103) +++ head/www/nghttp2/files/patch-src-asio_server_connection.h (nonexistent) @@ -1,35 +0,0 @@ -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(); Property changes on: head/www/nghttp2/files/patch-src-asio_server_connection.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property