Index: head/www/nghttp2/Makefile =================================================================== --- head/www/nghttp2/Makefile (revision 402946) +++ head/www/nghttp2/Makefile (revision 402947) @@ -1,68 +1,68 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= www net MASTER_SITES= https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libev>=4.15:${PORTSDIR}/devel/libev \ libevent2>=2.0.8:${PORTSDIR}/devel/libevent2 \ spdylay>=1.3.0:${PORTSDIR}/www/spdylay LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev \ libevent_openssl.so:${PORTSDIR}/devel/libevent2 \ libspdylay.so:${PORTSDIR}/www/spdylay RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= ASIO DOCS HPACK OPTIONS_DEFAULT=HPACK OPTIONS_SUB= yes CONFIGURE_ARGS= --disable-python-bindings \ --enable-app \ --enable-examples \ --with-spdylay CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ ZLIB_CFLAGS="-I${INCLUDEDIR}" \ ZLIB_LIBS="-L${LIBDIR} -lz" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_CXXSTD= c++11 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes USES= compiler:c++11-lib gmake libtool localbase pathfix pkgconfig tar:xz PORTDATA= fetch-ocsp-response PORTDOCS= * ASIO_BUILD_DEPENDS= boost-libs>=1.54.0:${PORTSDIR}/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:${PORTSDIR}/devel/boost-libs ASIO_RUN_DEPENDS= boost-libs>=1.54.0:${PORTSDIR}/devel/boost-libs HPACK_CONFIGURE_ENABLE= hpack-tools HPACK_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson .include .if ${OSVERSION} <= 1000000 CPPFLAGS+= -D_GLIBCXX_USE_C99 .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 CONFIGURE_ARGS+=--with-jemalloc .endif post-patch: @${REINPLACE_CMD} -e '/JEMALLOC_LIBS/ s|-ljemalloc||' ${WRKSRC}/configure .include Index: head/www/nghttp2/distinfo =================================================================== --- head/www/nghttp2/distinfo (revision 402946) +++ head/www/nghttp2/distinfo (revision 402947) @@ -1,2 +1,2 @@ -SHA256 (nghttp2-1.4.0.tar.xz) = 20d1481fe7fa65fd4f25457a43406a6f627a34f19b61f488a18ab56e2ef15b65 -SIZE (nghttp2-1.4.0.tar.xz) = 1388820 +SHA256 (nghttp2-1.5.0.tar.xz) = 52e345d46d6f990dc19be8a35403a5230345182d26d04cb82abbea4a168f5987 +SIZE (nghttp2-1.5.0.tar.xz) = 1398256 Index: head/www/nghttp2/files/patch-src-asio_common.cc =================================================================== --- head/www/nghttp2/files/patch-src-asio_common.cc (nonexistent) +++ head/www/nghttp2/files/patch-src-asio_common.cc (revision 402947) @@ -0,0 +1,14 @@ +--- src/asio_common.cc.orig 2015-11-26 13:27:10 UTC ++++ src/asio_common.cc +@@ -177,9 +177,11 @@ bool tls_h2_negotiated(ssl_socket &socke + unsigned int next_proto_len = 0; + + SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len); ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L + if (next_proto == nullptr) { + SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len); + } ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L + + if (next_proto == nullptr) { + return false; Property changes on: head/www/nghttp2/files/patch-src-asio_common.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nghttp2/pkg-plist =================================================================== --- head/www/nghttp2/pkg-plist (revision 402946) +++ head/www/nghttp2/pkg-plist (revision 402947) @@ -1,25 +1,25 @@ %%HPACK%%bin/deflatehd bin/h2load %%HPACK%%bin/inflatehd bin/nghttp bin/nghttpd bin/nghttpx %%ASIO%%include/nghttp2/asio_http2.h %%ASIO%%include/nghttp2/asio_http2_client.h %%ASIO%%include/nghttp2/asio_http2_server.h include/nghttp2/nghttp2.h include/nghttp2/nghttp2ver.h lib/libnghttp2.a lib/libnghttp2.so lib/libnghttp2.so.14 -lib/libnghttp2.so.14.2.0 +lib/libnghttp2.so.14.3.0 %%ASIO%%lib/libnghttp2_asio.a %%ASIO%%lib/libnghttp2_asio.so %%ASIO%%lib/libnghttp2_asio.so.1 %%ASIO%%lib/libnghttp2_asio.so.1.0.0 libdata/pkgconfig/libnghttp2.pc %%ASIO%%libdata/pkgconfig/libnghttp2_asio.pc man/man1/h2load.1.gz man/man1/nghttp.1.gz man/man1/nghttpd.1.gz man/man1/nghttpx.1.gz