Date: Wed, 18 Mar 2026 17:57:18 +0000 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: b426bd7d488b - main - www/h2o: update to 20260228 snapshot Message-ID: <69bae77e.2730f.436b6661@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=b426bd7d488b6da5dbd70a577b0deacc3790f283 commit b426bd7d488b6da5dbd70a577b0deacc3790f283 Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2026-03-18 17:31:34 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> CommitDate: 2026-03-18 17:57:07 +0000 www/h2o: update to 20260228 snapshot Tested by: Uwe Trenkner <uwe@trenknerconsulting.com> Sponsored by: SkunkWerks, GmbH --- www/h2o/Makefile | 4 +- www/h2o/distinfo | 6 +-- www/h2o/files/patch-CMakeLists.txt | 24 ++++++------ www/h2o/pkg-plist | 80 +++++++++++++++++++++++++++++++++++--- 4 files changed, 92 insertions(+), 22 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index c479fdf9372d..5d08ed3d85fb 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,6 +1,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20241011 +DISTVERSION= 2.3.0-dev.20260228 CATEGORIES= www MAINTAINER= dch@FreeBSD.org @@ -19,7 +19,7 @@ LIB_DEPENDS= libhiredis.so:databases/hiredis \ USES= cmake compiler:c11 cpe pathfix perl5 pkgconfig shebangfix ssl CPE_VENDOR= dena USE_GITHUB= yes -GH_TAGNAME= 8398a11 +GH_TAGNAME= 725e54b USE_LDCONFIG= YES USE_RC_SUBR= ${PORTNAME} diff --git a/www/h2o/distinfo b/www/h2o/distinfo index 2c333cdd1be5..13c0e5acf1cb 100644 --- a/www/h2o/distinfo +++ b/www/h2o/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728640824 -SHA256 (h2o-h2o-v2.3.0-dev.20241011-8398a11_GH0.tar.gz) = f5f7b7b3c1b68022bf5cf381e146aeee4675334692241d23db42fc633b131781 -SIZE (h2o-h2o-v2.3.0-dev.20241011-8398a11_GH0.tar.gz) = 30844498 +TIMESTAMP = 1773397726 +SHA256 (h2o-h2o-v2.3.0-dev.20260228-725e54b_GH0.tar.gz) = 00025d179256434ba3d3295dced73011d17a5c993f4ebd6576f3ca0bf5381cc3 +SIZE (h2o-h2o-v2.3.0-dev.20260228-725e54b_GH0.tar.gz) = 30856424 diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt index e12910ad6c2f..1cc55cdaaf2d 100644 --- a/www/h2o/files/patch-CMakeLists.txt +++ b/www/h2o/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2024-10-11 10:00:58 UTC +--- CMakeLists.txt.orig 2026-03-13 10:31:00 UTC +++ CMakeLists.txt -@@ -174,7 +174,6 @@ INCLUDE_DIRECTORIES( +@@ -177,7 +177,6 @@ INCLUDE_DIRECTORIES( deps/cloexec deps/brotli/c/include deps/golombset @@ -8,7 +8,7 @@ deps/libgkc deps/libyrmcds deps/klib -@@ -186,7 +185,6 @@ INCLUDE_DIRECTORIES( +@@ -189,7 +188,6 @@ INCLUDE_DIRECTORIES( deps/picotls/deps/micro-ecc deps/picotls/include deps/quicly/include @@ -16,7 +16,7 @@ deps/yoml ${CMAKE_CURRENT_BINARY_DIR}) -@@ -257,6 +255,23 @@ ENDIF (PKG_CONFIG_FOUND) +@@ -260,6 +258,22 @@ ENDIF (PKG_CONFIG_FOUND) ENDIF (LIBCAP_FOUND) ENDIF (PKG_CONFIG_FOUND) @@ -35,21 +35,20 @@ + LINK_DIRECTORIES(${LIBYAML_LIBRARY_DIRS}) + ENDIF (LIBYAML_FOUND) +ENDIF (PKG_CONFIG_FOUND) -+ + SET(CC_WARNING_FLAGS "-Wall -Wno-unused-value -Wno-unused-function -Wno-nullability-completeness -Wno-expansion-to-defined -Werror=implicit-function-declaration -Werror=incompatible-pointer-types") IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") -@@ -269,7 +284,7 @@ ENDIF () +@@ -272,7 +286,7 @@ ENDIF () ENDIF () # setup compile flags --SET(CMAKE_C_FLAGS "-g3 ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"") -+SET(CMAKE_C_FLAGS "${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\"") +-SET(CMAKE_C_FLAGS "-g3 ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\" -DH2O_LOCALSTATEDIR=\"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}\"") ++SET(CMAKE_C_FLAGS "${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS} -DH2O_ROOT=\"${CMAKE_INSTALL_PREFIX}\" -DH2O_CONFIG_PATH=\"${CMAKE_INSTALL_FULL_SYSCONFDIR}/h2o.conf\" -DH2O_LOCALSTATEDIR=\"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}\"") IF (WITH_DTRACE) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICOTLS_USE_DTRACE=1 -DQUICLY_USE_DTRACE=1 -DH2O_USE_DTRACE=1") ENDIF () -@@ -339,12 +354,6 @@ SET(LIB_SOURCE_FILES +@@ -342,12 +356,6 @@ SET(LIB_SOURCE_FILES SET(LIB_SOURCE_FILES deps/cloexec/cloexec.c @@ -62,7 +61,7 @@ deps/libgkc/gkc.c deps/libyrmcds/close.c deps/libyrmcds/connect.c -@@ -498,7 +507,6 @@ SET(UNIT_TEST_SOURCE_FILES +@@ -501,7 +509,6 @@ SET(UNIT_TEST_SOURCE_FILES SET(UNIT_TEST_SOURCE_FILES ${LIB_SOURCE_FILES} @@ -70,7 +69,7 @@ ${BROTLI_SOURCE_FILES} deps/picotest/picotest.c t/00unit/test.c -@@ -711,6 +719,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E +@@ -714,6 +721,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E COMPILE_FLAGS "-DH2O_USE_LIBUV=0") TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${EXTRA_LIBS}) @@ -81,7 +80,7 @@ SET_TARGET_PROPERTIES(examples-socket-client-evloop PROPERTIES COMPILE_FLAGS "-DH2O_USE_LIBUV=0" EXCLUDE_FROM_ALL 1) -@@ -789,6 +801,15 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE +@@ -797,6 +808,16 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE SET_TARGET_PROPERTIES(h2o PROPERTIES COMPILE_FLAGS "${STANDALONE_COMPILE_FLAGS}") TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${OPENSSL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS}) @@ -94,6 +93,7 @@ + TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${LIBYXML_INCLUDE_DIRS}) + TARGET_LINK_LIBRARIES(h2o ${LIBYAML_LIBRARIES}) +ENDIF (LIBYAML_FOUND) ++ IF (WITH_MRUBY) TARGET_INCLUDE_DIRECTORIES(h2o BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby/include ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby-input-stream/src) # note: the paths need to be determined before libmruby.flags.mak is generated diff --git a/www/h2o/pkg-plist b/www/h2o/pkg-plist index b46446ec6e86..dddcdfc511de 100644 --- a/www/h2o/pkg-plist +++ b/www/h2o/pkg-plist @@ -1,5 +1,8 @@ @dir(%%H2O_USER%%,%%H2O_GROUP%%,0750) %%H2O_LOGDIR%% @sample %%ETCDIR%%/h2o.conf.sample +%%DATADIR%%/acme/lego-loader +%%DATADIR%%/acme/loading.crt +%%DATADIR%%/acme/loading.key %%DATADIR%%/annotate-backtrace-symbols %%DATADIR%%/ca-bundle.crt %%DATADIR%%/fastcgi-cgi @@ -79,13 +82,13 @@ %%PORTDOCS%%%%DOCSDIR%%/search/oktavia-jquery-ui.js %%PORTDOCS%%%%DOCSDIR%%/search/searchindex.js bin/h2o +bin/h2olog include/h2o.h include/h2o/absprio.h include/h2o/balancer.h -include/h2o/cache_digests.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 @@ -93,21 +96,23 @@ 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/http2.h include/h2o/http3_common.h include/h2o/http3_internal.h include/h2o/http3_server.h include/h2o/httpclient.h +include/h2o/io_uring.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/pipe_sender.h include/h2o/qpack.h include/h2o/rand.h include/h2o/redis.h @@ -120,8 +125,8 @@ 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/token_table.h include/h2o/url.h include/h2o/version.h include/h2o/websocket.h @@ -150,11 +155,76 @@ include/quicly/ranges.h include/quicly/rate.h include/quicly/recvstate.h include/quicly/remote_cid.h -include/quicly/retire_cid.h include/quicly/sendstate.h include/quicly/sentmap.h include/quicly/streambuf.h libdata/pkgconfig/libh2o-evloop.pc libdata/pkgconfig/libh2o.pc +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%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/h2olog.html +%%PORTDOCS%%%%DOCSDIR%%/configure/headers_directives.html +%%PORTDOCS%%%%DOCSDIR%%/configure/http1_directives.html +%%PORTDOCS%%%%DOCSDIR%%/configure/http2_directives.html +%%PORTDOCS%%%%DOCSDIR%%/configure/http3_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/ech.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/wildcard.crt +%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/wildcard.key +%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/h2o.conf +%%PORTDOCS%%%%DOCSDIR%%/examples/h2o_mruby/hello.rb +%%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%%/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 share/man/man5/h2o.conf.5.gz share/man/man8/h2o.8.gz +@comment @dir var/h2o/acme/certificates +@comment @dir var/h2o/acme/webroot +@dir /var/log/h2ohome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bae77e.2730f.436b6661>