Date: Tue, 5 Sep 2023 20:34:44 GMT From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 638826ec0844 - main - www/h2o-devel: update to 20230817 snapshot Message-ID: <202309052034.385KYiju090023@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=638826ec084420e4ea7cbb5c0c55d0d92a8b7b99 commit 638826ec084420e4ea7cbb5c0c55d0d92a8b7b99 Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2023-09-05 20:34:37 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> CommitDate: 2023-09-05 20:34:37 +0000 www/h2o-devel: update to 20230817 snapshot Reported by: Max Kostikov <max@kostikov.co> Sponsored by: SkunkWerks, GmbH PR: 271239 --- www/h2o-devel/Makefile | 51 ++++++++--------- www/h2o-devel/distinfo | 6 +- www/h2o-devel/pkg-plist | 146 ++++++++++++++++++++++++------------------------ 3 files changed, 99 insertions(+), 104 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 15a9a7505acd..9b5433ffc2b8 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20230427 +DISTVERSION= 2.3.0-dev.20230817 CATEGORIES= www PKGNAMESUFFIX= -devel @@ -8,64 +8,57 @@ MAINTAINER= dch@FreeBSD.org COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x WWW= https://github.com/h2o/h2o -LICENSE= MIT BSD2CLAUSE +LICENSE= BSD2CLAUSE MIT 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_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' BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake LIB_DEPENDS= libuv.so:devel/libuv -USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig +USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl CPE_VENDOR= dena USE_GITHUB= yes +GH_TAGNAME= 70dd2d8 USE_LDCONFIG= yes -GH_TAGNAME= f010336 -CONFLICTS= h2o +USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= share/h2o/start_server -PORTDOCS= README.md +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF \ + -DWITH_BUNDLED_SSL=OFF + +CONFLICTS= h2o SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample -SUB_LIST+= H2O_USER=${H2O_USER} \ - H2O_GROUP=${H2O_GROUP} \ - H2O_LOGDIR=${H2O_LOGDIR} +SUB_LIST+= H2O_GROUP=${H2O_GROUP} \ + H2O_LOGDIR=${H2O_LOGDIR} \ + H2O_USER=${H2O_USER} -PLIST_SUB= H2O_USER=${H2O_USER} \ - H2O_GROUP=${H2O_GROUP} \ - H2O_LOGDIR=${H2O_LOGDIR} +PLIST_SUB= H2O_GROUP=${H2O_GROUP} \ + H2O_LOGDIR=${H2O_LOGDIR} \ + H2O_USER=${H2O_USER} +PORTDOCS= README.md +.ifnmake portclippy H2O_USER?= www H2O_GROUP?= www H2O_LOGDIR= /var/log/${PORTNAME}/ +.endif -USE_RC_SUBR= ${PORTNAME} - -OPTIONS_DEFINE= MRUBY DOCS +OPTIONS_DEFINE= DOCS MRUBY OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes MRUBY_DESC= Build with embedded mruby handler support -CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF -DWITH_BUNDLED_SSL=OFF - -MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison ruby:build +MRUBY_CMAKE_BOOL= WITH_MRUBY .include <bsd.port.options.mk> -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} diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo index d915bed709d4..74dbcc4f6cff 100644 --- a/www/h2o-devel/distinfo +++ b/www/h2o-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682863965 -SHA256 (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = d8668a6687340e8af56ce997fd36687ff4c41d86d8d195eb6dff8b46e746b3ff -SIZE (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = 30505376 +TIMESTAMP = 1693558446 +SHA256 (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 075f1da946b4fe32792b3f97e9ac44463febbef6235533d59a5c4bc53bc8c09d +SIZE (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 30555369 diff --git a/www/h2o-devel/pkg-plist b/www/h2o-devel/pkg-plist index 212866fc94ad..d67651f52feb 100644 --- a/www/h2o-devel/pkg-plist +++ b/www/h2o-devel/pkg-plist @@ -1,56 +1,22 @@ -bin/h2o @comment bin/h2o-httpclient +@dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% @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_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/url.h -include/h2o/version.h -include/h2o/websocket.h -libdata/pkgconfig/libh2o-evloop.pc -libdata/pkgconfig/libh2o.pc -share/man/man5/h2o.conf.5.gz -share/man/man8/h2o.8.gz +%%DATADIR%%/annotate-backtrace-symbols +%%DATADIR%%/ca-bundle.crt +%%DATADIR%%/fastcgi-cgi +%%DATADIR%%/fetch-ocsp-response +%%DATADIR%%/kill-on-close +%%DATADIR%%/setuidgid +%%DATADIR%%/start_server +%%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/prometheus.rb +%%MRUBY%%%%DATADIR%%/mruby/trie_addr.rb %%PORTDOCS%%%%DOCSDIR%%/assets/8mbps100msec-nginx195-h2o150.png %%PORTDOCS%%%%DOCSDIR%%/assets/firstpaintbench.png %%PORTDOCS%%%%DOCSDIR%%/assets/remotebench.png @@ -71,11 +37,13 @@ share/man/man8/h2o.8.gz %%PORTDOCS%%%%DOCSDIR%%/configure/expires_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/fastcgi_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/file_directives.html +%%PORTDOCS%%%%DOCSDIR%%/configure/h2olog.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/http3_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/mruby_directives.html +%%PORTDOCS%%%%DOCSDIR%%/configure/mruby.html %%PORTDOCS%%%%DOCSDIR%%/configure/proxy_directives.html %%PORTDOCS%%%%DOCSDIR%%/configure/quick_start.html %%PORTDOCS%%%%DOCSDIR%%/configure/redirect_directives.html @@ -87,6 +55,8 @@ share/man/man8/h2o.8.gz %%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_mruby/h2o.conf +%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/ech.key @@ -94,8 +64,6 @@ share/man/man8/h2o.8.gz %%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 @@ -103,28 +71,62 @@ share/man/man8/h2o.8.gz %%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%%/h2o.conf.5 %%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%% +bin/h2o +include/h2o.h +include/h2o/absprio.h +include/h2o/balancer.h +include/h2o/cache_digests.h +include/h2o/cache.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_casper.h +include/h2o/http2_common.h +include/h2o/http2_internal.h +include/h2o/http2_scheduler.h +include/h2o/http2.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_table.h +include/h2o/token.h +include/h2o/url.h +include/h2o/version.h +include/h2o/websocket.h +libdata/pkgconfig/libh2o-evloop.pc +libdata/pkgconfig/libh2o.pc +share/man/man5/h2o.conf.5.gz +share/man/man8/h2o.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309052034.385KYiju090023>