Index: head/www/nghttp2/Makefile =================================================================== --- head/www/nghttp2/Makefile (revision 434943) +++ head/www/nghttp2/Makefile (revision 434944) @@ -1,94 +1,93 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.19.0 +PORTVERSION= 1.20.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 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 SPDY OPTIONS_DEFAULT=APP HPACK SPDY OPTIONS_SUB= yes APP_DESC= Build h2load, nghttp, nghttpd and nghttpx SPDY_DESC= Enable SPDY in h2load and nghttpx SPDY_IMPLIES= APP CONFIGURE_ARGS= --disable-python-bindings CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_RC_SUBR= nghttpx USES= autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig ssl 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 SPDY_BUILD_DEPENDS= spdylay>=1.3.2:www/spdylay SPDY_CONFIGURE_WITH= spdylay SPDY_LIB_DEPENDS= libspdylay.so:www/spdylay .include .if ${OPSYS} == FreeBSD CONFIGURE_ARGS+=--with-jemalloc .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| lib||' ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e 's|$$[({]top_builddir[})]/lib/libnghttp2.la|-lnghttp2|' ${WRKSRC}/*/Makefile.am # 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 # Disable thread_local support for hosts without __cxa_thread_atexit() # See PR/192320 for details .if (${OSVERSION} < 1003506) || ((${OSVERSION} >= 1100000) && (${OSVERSION} < 1100122)) || (${OSVERSION} == 1100500) @${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h .endif 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 434943) +++ head/www/nghttp2/distinfo (revision 434944) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485371875 -SHA256 (nghttp2-nghttp2-v1.19.0_GH0.tar.gz) = 8c5abd6a437e84e9131b575acab2faec7f83e57eff516ee043baad704311ba6d -SIZE (nghttp2-nghttp2-v1.19.0_GH0.tar.gz) = 1707121 +TIMESTAMP = 1488199401 +SHA256 (nghttp2-nghttp2-v1.20.0_GH0.tar.gz) = 19324b348e0d9e3eb6198f4ab8d0355d0b81c2f871f722ebf4484a2f25d0ba71 +SIZE (nghttp2-nghttp2-v1.20.0_GH0.tar.gz) = 1733526 Index: head/www/nghttp2/files/patch-src-shrpx_config.cc =================================================================== --- head/www/nghttp2/files/patch-src-shrpx_config.cc (revision 434943) +++ head/www/nghttp2/files/patch-src-shrpx_config.cc (nonexistent) @@ -1,55 +0,0 @@ -Obtained from: https://github.com/nghttp2/nghttp2/commit/16be89f9ccba4d37e34ef03f20009a9845efeb99 - https://github.com/nghttp2/nghttp2/commit/1cc08c0a51d273afc0e7b4e11eeb0b889d154ee0 - ---- src/shrpx_config.cc.orig 2017-01-25 11:30:16 UTC -+++ src/shrpx_config.cc -@@ -1199,6 +1199,7 @@ int read_tls_sct_from_dir(std::vectortls.psk_secrets. This function -@@ -1262,7 +1263,9 @@ int parse_psk_secrets(Config *config, co - return 0; - } - } // namespace -+#endif // !LIBRESSL_IN_USE - -+#if !LIBRESSL_IN_USE - namespace { - // Reads PSK secrets from path, and parses each line. The result is - // directly stored into config->tls.client.psk. This function returns -@@ -1322,6 +1325,7 @@ int parse_client_psk_secrets(Config *con - return 0; - } - } // namespace -+#endif // !LIBRESSL_IN_USE - - // generated by gennghttpxfun.py - int option_lookup_token(const char *name, size_t namelen) { -@@ -3284,9 +3288,23 @@ int parse_config(Config *config, int opt - return parse_duration(&config->conn.upstream.timeout.idle_read, opt, - optarg); - case SHRPX_OPTID_PSK_SECRETS: -+#if !LIBRESSL_IN_USE - return parse_psk_secrets(config, optarg); -+#else // LIBRESSL_IN_USE -+ LOG(WARN) -+ << opt -+ << ": ignored because underlying TLS library does not support PSK"; -+ return 0; -+#endif // LIBRESSL_IN_USE - case SHRPX_OPTID_CLIENT_PSK_SECRETS: -+#if !LIBRESSL_IN_USE - return parse_client_psk_secrets(config, optarg); -+#else // LIBRESSL_IN_USE -+ LOG(WARN) -+ << opt -+ << ": ignored because underlying TLS library does not support PSK"; -+ return 0; -+#endif // LIBRESSL_IN_USE - case SHRPX_OPTID_CLIENT_NO_HTTP2_CIPHER_BLACK_LIST: - config->tls.client.no_http2_cipher_black_list = - util::strieq_l("yes", optarg); Property changes on: head/www/nghttp2/files/patch-src-shrpx_config.cc ___________________________________________________________________ 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 Index: head/www/nghttp2/files/patch-src-shrpx_ssl.cc =================================================================== --- head/www/nghttp2/files/patch-src-shrpx_ssl.cc (revision 434943) +++ head/www/nghttp2/files/patch-src-shrpx_ssl.cc (nonexistent) @@ -1,50 +0,0 @@ -Obtained from: https://github.com/nghttp2/nghttp2/commit/16be89f9ccba4d37e34ef03f20009a9845efeb99 - ---- src/shrpx_ssl.cc.orig 2017-01-25 11:30:16 UTC -+++ src/shrpx_ssl.cc -@@ -525,6 +525,7 @@ int sct_parse_cb(SSL *ssl, unsigned int - } // namespace - #endif // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L - -+#if !LIBRESSL_IN_USE - namespace { - unsigned int psk_server_cb(SSL *ssl, const char *identity, unsigned char *psk, - unsigned int max_psk_len) { -@@ -548,7 +549,9 @@ unsigned int psk_server_cb(SSL *ssl, con - return static_cast(secret.size()); - } - } // namespace -+#endif // !LIBRESSL_IN_USE - -+#if !LIBRESSL_IN_USE - namespace { - unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity_out, - unsigned int max_identity_len, unsigned char *psk, -@@ -581,6 +584,7 @@ unsigned int psk_client_cb(SSL *ssl, con - return (unsigned int)secret.size(); - } - } // namespace -+#endif // !LIBRESSL_IN_USE - - struct TLSProtocol { - StringRef name; -@@ -784,7 +788,9 @@ SSL_CTX *create_ssl_context(const char * - } - #endif // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L - -+#if !LIBRESSL_IN_USE - SSL_CTX_set_psk_server_callback(ssl_ctx, psk_server_cb); -+#endif // !LIBRESSL_IN_USE - - auto tls_ctx_data = new TLSContextData(); - tls_ctx_data->cert_file = cert_file; -@@ -919,7 +925,9 @@ SSL_CTX *create_ssl_client_context( - #endif // HAVE_NEVERBLEED - } - -+#if !LIBRESSL_IN_USE - SSL_CTX_set_psk_client_callback(ssl_ctx, psk_client_cb); -+#endif // !LIBRESSL_IN_USE - - // NPN selection callback. This is required to set SSL_CTX because - // OpenSSL does not offer SSL_set_next_proto_select_cb. Property changes on: head/www/nghttp2/files/patch-src-shrpx_ssl.cc ___________________________________________________________________ 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