git: 0481907585fa - main - www/h2o: Update to 20260102 snapshot

The branch main has been updated by dch:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0481907585fa04f97e97e24e5176518eaf1c7727

commit 0481907585fa04f97e97e24e5176518eaf1c7727
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2026-10-06 08:14:34 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2026-10-06 08:43:49 +0000

    www/h2o: Update to 20260102 snapshot
    
    Sponsored by:   SkunkWerks, GmbH
---
 www/h2o/Makefile                   |  9 +++++----
 www/h2o/distinfo                   |  6 +++---
 www/h2o/files/patch-CMakeLists.txt | 24 ++++++++++++------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index 37cdb892d75c..054d96fa5957 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	h2o
-DISTVERSION=	20260913
+DISTVERSION=	20261006
 CATEGORIES=	www
 
 MAINTAINER=	dch@FreeBSD.org
@@ -12,19 +12,20 @@ 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
 
-LIB_DEPENDS=	libhiredis.so:databases/hiredis \
+LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+		libhiredis.so:databases/hiredis \
 		libyaml.so:textproc/libyaml
 
 USES=		cmake compiler:c11 cpe pathfix perl5 pkgconfig shebangfix ssl
 CPE_VENDOR=	dena
 USE_GITHUB=	yes
-GH_TAGNAME=	ed7899d
+GH_TAGNAME=	5da5054
 USE_LDCONFIG=	YES
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	share/h2o/start_server
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	BUILD_SHARED_LIBS WITH_BROTLI
 
 EXTRACT_AFTER_ARGS=	--exclude deps/hiredis --exclude deps/yaml/include
 
diff --git a/www/h2o/distinfo b/www/h2o/distinfo
index 92cbbe3b1f7f..a6309946f2ac 100644
--- a/www/h2o/distinfo
+++ b/www/h2o/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1790332827
-SHA256 (h2o-h2o-20260913-ed7899d_GH0.tar.gz) = 18fb3e194b596131721bbd866f708c318440919d3c01fa73dcb955503f5aa741
-SIZE (h2o-h2o-20260913-ed7899d_GH0.tar.gz) = 30889720
+TIMESTAMP = 1791272072
+SHA256 (h2o-h2o-20261006-5da5054_GH0.tar.gz) = a4d7bc745ceb570e125107c56e6e99fa21f541ee1091a5688dfb8163f6f906ad
+SIZE (h2o-h2o-20261006-5da5054_GH0.tar.gz) = 7192269
diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt
index 1cc55cdaaf2d..4615f375bfab 100644
--- a/www/h2o/files/patch-CMakeLists.txt
+++ b/www/h2o/files/patch-CMakeLists.txt
@@ -1,14 +1,14 @@
---- CMakeLists.txt.orig	2026-03-13 10:31:00 UTC
+--- CMakeLists.txt.orig	2026-10-06 07:34:35 UTC
 +++ CMakeLists.txt
-@@ -177,7 +177,6 @@ INCLUDE_DIRECTORIES(
+@@ -181,7 +181,6 @@ INCLUDE_DIRECTORIES(
+     include
      deps/cloexec
-     deps/brotli/c/include
      deps/golombset
 -    deps/hiredis
      deps/libgkc
      deps/libyrmcds
      deps/klib
-@@ -189,7 +188,6 @@ INCLUDE_DIRECTORIES(
+@@ -193,7 +192,6 @@ INCLUDE_DIRECTORIES(
      deps/picotls/deps/micro-ecc
      deps/picotls/include
      deps/quicly/include
@@ -16,7 +16,7 @@
      deps/yoml
      ${CMAKE_CURRENT_BINARY_DIR})
  
-@@ -260,6 +258,22 @@ ENDIF (PKG_CONFIG_FOUND)
+@@ -293,6 +291,22 @@ ENDIF (PKG_CONFIG_FOUND)
      ENDIF (LIBCAP_FOUND)
  ENDIF (PKG_CONFIG_FOUND)
  
@@ -39,7 +39,7 @@
  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")
-@@ -272,7 +286,7 @@ ENDIF ()
+@@ -305,7 +319,7 @@ ENDIF ()
  ENDIF ()
  
  # setup compile flags
@@ -48,7 +48,7 @@
  IF (WITH_DTRACE)
      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICOTLS_USE_DTRACE=1 -DQUICLY_USE_DTRACE=1 -DH2O_USE_DTRACE=1")
  ENDIF ()
-@@ -342,12 +356,6 @@ SET(LIB_SOURCE_FILES
+@@ -350,12 +364,6 @@ SET(LIB_SOURCE_FILES
  
  SET(LIB_SOURCE_FILES
      deps/cloexec/cloexec.c
@@ -61,15 +61,15 @@
      deps/libgkc/gkc.c
      deps/libyrmcds/close.c
      deps/libyrmcds/connect.c
-@@ -501,7 +509,6 @@ SET(UNIT_TEST_SOURCE_FILES
+@@ -517,7 +525,6 @@ SET(UNIT_TEST_SOURCE_FILES
  
  SET(UNIT_TEST_SOURCE_FILES
      ${LIB_SOURCE_FILES}
 -    ${LIBYAML_SOURCE_FILES}
-     ${BROTLI_SOURCE_FILES}
      deps/picotest/picotest.c
      t/00unit/test.c
-@@ -714,6 +721,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E
+     t/00unit/lib/common/balancer/least_conn.c
+@@ -723,6 +730,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E
      COMPILE_FLAGS "-DH2O_USE_LIBUV=0")
  TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${EXTRA_LIBS})
  
@@ -80,7 +80,7 @@
  SET_TARGET_PROPERTIES(examples-socket-client-evloop PROPERTIES
      COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
      EXCLUDE_FROM_ALL 1)
-@@ -797,6 +808,16 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE
+@@ -805,6 +816,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})
@@ -90,7 +90,7 @@
 +ENDIF (HIREDIS_FOUND)
 +
 +IF (LIBYAML_FOUND)
-+   TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${LIBYXML_INCLUDE_DIRS})
++   TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${LIBYAML_INCLUDE_DIRS})
 +   TARGET_LINK_LIBRARIES(h2o ${LIBYAML_LIBRARIES})
 +ENDIF (LIBYAML_FOUND)
 +