Index: branches/2018Q3/www/h2o/Makefile =================================================================== --- branches/2018Q3/www/h2o/Makefile (revision 473920) +++ branches/2018Q3/www/h2o/Makefile (revision 473921) @@ -1,80 +1,79 @@ # Created by: Dave Cottlehuber # $FreeBSD$ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.2.4 -PORTREVISION= 1 +DISTVERSION= 2.2.5 CATEGORIES= www MAINTAINER= dch@FreeBSD.org COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x LICENSE= MIT BSD2CLAUSE LICENSE_COMB= multi BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported BROKEN_powerpc64= fails to link: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6' LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig CPE_VENDOR= h2o_project USE_GITHUB= yes USE_PERL5= run SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample SUB_LIST+= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} PLIST_SUB= H2O_USER=${H2O_USER} \ H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} H2O_USER?= www H2O_GROUP?= www H2O_LOGDIR= /var/log/${PORTNAME}/ USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= MRUBY DOCS OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes MRUBY_DESC= Build with embedded mruby handler support CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON -DWITH_BUNDLED_SSL=OFF CMAKE_VERBOSE= yes MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison MRUBY_USE= ruby=yes MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes post-patch: @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ ${WRKSRC}/share/h2o/fastcgi-cgi \ ${WRKSRC}/share/h2o/fetch-ocsp-response \ ${WRKSRC}/share/h2o/kill-on-close \ ${WRKSRC}/share/h2o/setuidgid \ ${WRKSRC}/share/h2o/start_server post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${H2O_LOGDIR} ${INSTALL_DATA} \ ${WRKDIR}/${PORTNAME}.conf.sample \ ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Index: branches/2018Q3/www/h2o/distinfo =================================================================== --- branches/2018Q3/www/h2o/distinfo (revision 473920) +++ branches/2018Q3/www/h2o/distinfo (revision 473921) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513347798 -SHA256 (h2o-h2o-v2.2.4_GH0.tar.gz) = ebacf3b15f40958c950e18e79ad5a647f61e989c6dbfdeea858ce943ef5e3cd8 -SIZE (h2o-h2o-v2.2.4_GH0.tar.gz) = 16212596 +TIMESTAMP = 1529785115 +SHA256 (h2o-h2o-v2.2.5_GH0.tar.gz) = eafb40aa2d93b3de1af472bb046c17b2335c3e5a894462310e1822e126c97d24 +SIZE (h2o-h2o-v2.2.5_GH0.tar.gz) = 16257295 Index: branches/2018Q3/www/h2o/files/patch-issue1706 =================================================================== --- branches/2018Q3/www/h2o/files/patch-issue1706 (revision 473920) +++ branches/2018Q3/www/h2o/files/patch-issue1706 (nonexistent) @@ -1,55 +0,0 @@ -https://github.com/h2o/h2o/issues/1706 - ---- include/h2o/openssl_backport.h.orig 2017-12-15 03:08:00 UTC -+++ include/h2o/openssl_backport.h -@@ -25,7 +25,7 @@ - #include - - /* backports for OpenSSL 1.0.2 */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - #define BIO_get_data(bio) ((bio)->ptr) - #define BIO_set_data(bio, p) ((bio)->ptr = (p)) -@@ -57,7 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i - #endif - - /* backports for OpenSSL 1.0.1 and LibreSSL */ --#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - #define SSL_is_server(ssl) ((ssl)->server) - ---- deps/neverbleed/neverbleed.c.orig 2017-12-15 03:08:00 UTC -+++ deps/neverbleed/neverbleed.c -@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu - return 0; - } - --#if !OPENSSL_1_1_API -+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) - - static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) - { ---- deps/picotls/lib/openssl.c.orig 2017-12-15 03:08:00 UTC -+++ deps/picotls/lib/openssl.c -@@ -35,13 +35,16 @@ - #include "picotls.h" - #include "picotls/openssl.h" - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) --#define OPENSSL_1_0_API 1 -+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L -+#define OPENSSL_1_1_API 1 -+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+#define OPENSSL_1_1_API 1 - #else - #define OPENSSL_1_0_API 0 -+#define OPENSSL_1_1_API 0 - #endif - --#if OPENSSL_1_0_API -+#if !OPENSSL_1_1_API - - #define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) - #define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE) Property changes on: branches/2018Q3/www/h2o/files/patch-issue1706 ___________________________________________________________________ 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: branches/2018Q3/www/h2o/pkg-plist =================================================================== --- branches/2018Q3/www/h2o/pkg-plist (revision 473920) +++ branches/2018Q3/www/h2o/pkg-plist (revision 473921) @@ -1,112 +1,112 @@ bin/h2o include/h2o.h include/h2o/cache.h include/h2o/cache_digests.h include/h2o/configurator.h include/h2o/file.h include/h2o/filecache.h include/h2o/hostinfo.h include/h2o/http1.h include/h2o/http1client.h include/h2o/http2.h include/h2o/http2_casper.h include/h2o/http2_internal.h include/h2o/http2_scheduler.h include/h2o/linklist.h include/h2o/memcached.h include/h2o/memory.h include/h2o/mruby_.h include/h2o/multithread.h include/h2o/openssl_backport.h include/h2o/rand.h include/h2o/serverutil.h include/h2o/socket.h include/h2o/socket/evloop.h include/h2o/socket/uv-binding.h include/h2o/socketpool.h include/h2o/string_.h include/h2o/time_.h include/h2o/timeout.h include/h2o/token.h include/h2o/tunnel.h include/h2o/url.h include/h2o/version.h include/h2o/websocket.h lib/libh2o-evloop.so lib/libh2o-evloop.so.0.13 -lib/libh2o-evloop.so.0.13.4 +lib/libh2o-evloop.so.0.13.5 lib/libh2o.so lib/libh2o.so.0.13 -lib/libh2o.so.0.13.4 +lib/libh2o.so.0.13.5 libdata/pkgconfig/libh2o-evloop.pc libdata/pkgconfig/libh2o.pc %%DATADIR%%/annotate-backtrace-symbols %%DATADIR%%/fetch-ocsp-response %%DATADIR%%/kill-on-close %%DATADIR%%/start_server %%DATADIR%%/ca-bundle.crt %%DATADIR%%/fastcgi-cgi %%DATADIR%%/setuidgid %%DATADIR%%/status/index.html %%MRUBY%%%%DATADIR%%/mruby/acl.rb %%MRUBY%%%%DATADIR%%/mruby/bootstrap.rb %%MRUBY%%%%DATADIR%%/mruby/dos_detector.rb %%MRUBY%%%%DATADIR%%/mruby/htpasswd.rb %%MRUBY%%%%DATADIR%%/mruby/lru_cache.rb %%MRUBY%%%%DATADIR%%/mruby/preloads.rb %%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png %%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png %%PORTDOCS%%%%DOCSDIR%%/assets/searchstyle.css %%PORTDOCS%%%%DOCSDIR%%/assets/staticfile612-nginx1910-h2o170.png %%PORTDOCS%%%%DOCSDIR%%/assets/style.css %%PORTDOCS%%%%DOCSDIR%%/benchmarks.html %%PORTDOCS%%%%DOCSDIR%%/configure.html %%PORTDOCS%%%%DOCSDIR%%/configure/access_control.html %%PORTDOCS%%%%DOCSDIR%%/configure/access_log_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/base_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/basic_auth.html %%PORTDOCS%%%%DOCSDIR%%/configure/cgi.html %%PORTDOCS%%%%DOCSDIR%%/configure/command_options.html %%PORTDOCS%%%%DOCSDIR%%/configure/compress_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/dos_detection.html %%PORTDOCS%%%%DOCSDIR%%/configure/errordoc_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html %%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html %%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/reproxy_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/status_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/syntax_and_structure.html %%PORTDOCS%%%%DOCSDIR%%/configure/throttle_response_directives.html %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root.alternate/index.txt %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/http1client.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/install.html %%PORTDOCS%%%%DOCSDIR%%/search/jquery-1.9.1.min.js %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-english-search.js %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js %%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% @sample %%ETCDIR%%/h2o.conf.sample Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 473920) +++ branches/2018Q3 (revision 473921) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r473774