diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 8c4b80c1fd1f..62eaff007615 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -1,82 +1,84 @@ # Created by: Dave Cottlehuber PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-beta2.20210611 +DISTVERSION= 2.3.0-dev.20220131 CATEGORIES= www PKGNAMESUFFIX= -devel +PATCH_SITES= https://github.com/h2o/h2o/pull/ +PATCHFILES+= 2934.patch:-p1 + 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_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: 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= dena USE_GITHUB= yes -USE_PERL5= run USE_LDCONFIG= yes -GH_TAGNAME= 96bf0ef +GH_TAGNAME= a68cabae CONFLICTS= h2o 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_ARGS+= -DBUILD_SHARED_LIBS=OFF -DWITH_BUNDLED_SSL=OFF 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 diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo index 50c21d70cd8e..61625a9e91c3 100644 --- a/www/h2o-devel/distinfo +++ b/www/h2o-devel/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1623414836 -SHA256 (h2o-h2o-v2.3.0-beta2.20210611-96bf0ef_GH0.tar.gz) = 8a0e8e993a26caf3ea0f10aea26aea62a74a768cbd4e43f3e885974e45ae644e -SIZE (h2o-h2o-v2.3.0-beta2.20210611-96bf0ef_GH0.tar.gz) = 30020918 +TIMESTAMP = 1643753281 +SHA256 (h2o-h2o-v2.3.0-dev.20220131-a68cabae_GH0.tar.gz) = 8c9bad139b32e00e4666b0eb8cc78832c82391abd3f7d54aeb65a41d2df49309 +SIZE (h2o-h2o-v2.3.0-dev.20220131-a68cabae_GH0.tar.gz) = 30098653 +SHA256 (2934.patch) = 9119b6eb0cf3d8af36f9a94a88ffeed480c0e84c56c14d51c2d6d7ec55a5cca4 +SIZE (2934.patch) = 2985 diff --git a/www/h2o-devel/pkg-plist b/www/h2o-devel/pkg-plist index 57292701c580..e252c9298c02 100644 --- a/www/h2o-devel/pkg-plist +++ b/www/h2o-devel/pkg-plist @@ -1,136 +1,130 @@ bin/h2o @comment bin/h2o-httpclient @sample %%ETCDIR%%/h2o.conf.sample include/h2o.h include/h2o/absprio.h include/h2o/balancer.h include/h2o/cache.h include/h2o/cache_digests.h include/h2o/configurator.h include/h2o/ebpf.h include/h2o/file.h include/h2o/filecache.h include/h2o/header.h include/h2o/hiredis_.h include/h2o/hostinfo.h include/h2o/hpack.h include/h2o/http1.h include/h2o/http2.h include/h2o/http2_casper.h include/h2o/http2_common.h include/h2o/http2_internal.h include/h2o/http2_scheduler.h -include/h2o/http3_server.h include/h2o/http3_common.h include/h2o/http3_internal.h +include/h2o/http3_server.h include/h2o/httpclient.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/qpack.h include/h2o/rand.h include/h2o/redis.h include/h2o/send_state.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/timerwheel.h include/h2o/token.h include/h2o/token_table.h include/h2o/tunnel.h include/h2o/url.h include/h2o/version.h include/h2o/websocket.h -@comment lib/libh2o-evloop.so -@comment lib/libh2o-evloop.so.0.16 -@comment lib/libh2o-evloop.so.0.16.0-beta2 -@comment lib/libh2o.so -@comment lib/libh2o.so.0.16 -@comment lib/libh2o.so.0.16.0-beta2 libdata/pkgconfig/libh2o-evloop.pc libdata/pkgconfig/libh2o.pc man/man5/h2o.conf.5.gz man/man8/h2o.8.gz %%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/server_timing_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.third/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/server.pub %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf %%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.key %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/latency-optimization.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/redis-client.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/simple.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/socket-client.c %%PORTDOCS%%%%DOCSDIR%%/examples/libh2o/websocket.c %%PORTDOCS%%%%DOCSDIR%%/h2o.conf.5 %%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 %%DATADIR%%/annotate-backtrace-symbols %%DATADIR%%/fetch-ocsp-response %%DATADIR%%/kill-on-close %%DATADIR%%/start_server %%DATADIR%%/ca-bundle.crt %%DATADIR%%/fastcgi-cgi %%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/prometheus.rb %%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb %%DATADIR%%/setuidgid %%DATADIR%%/status/index.html @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%%