git: af42d952be72 - main - www/h2o: update to 20241011 snapshot

The branch main has been updated by dch:

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

commit af42d952be7251c207c3ae6db9fa312d8cfe0878
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2024-11-11 00:28:35 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2024-11-11 00:28:35 +0000

    www/h2o: update to 20241011 snapshot
    
    - https://github.com/h2o/h2o/security/advisories
    
    Security:       CVE-2024-25622
    Security:       CVE-2024-45403
    Security:       CVE-2024-45397
    Sponsored by:   SkunkWerks, GmbH
---
 www/h2o/Makefile                   |  4 ++--
 www/h2o/distinfo                   |  6 +++---
 www/h2o/files/patch-CMakeLists.txt | 11 ++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/www/h2o/Makefile b/www/h2o/Makefile
index 9c8001bcca77..c479fdf9372d 100644
--- a/www/h2o/Makefile
+++ b/www/h2o/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	h2o
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0-dev.20240411
+DISTVERSION=	2.3.0-dev.20241011
 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=	222b36d
+GH_TAGNAME=	8398a11
 USE_LDCONFIG=	YES
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/www/h2o/distinfo b/www/h2o/distinfo
index 2d4da3317841..2c333cdd1be5 100644
--- a/www/h2o/distinfo
+++ b/www/h2o/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714564834
-SHA256 (h2o-h2o-v2.3.0-dev.20240411-222b36d_GH0.tar.gz) = dc8db25dab7d009718c2309f5bfaa1c666900a6d574324170d68f39a26b2977b
-SIZE (h2o-h2o-v2.3.0-dev.20240411-222b36d_GH0.tar.gz) = 30763238
+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
diff --git a/www/h2o/files/patch-CMakeLists.txt b/www/h2o/files/patch-CMakeLists.txt
index 42fe23553092..e12910ad6c2f 100644
--- a/www/h2o/files/patch-CMakeLists.txt
+++ b/www/h2o/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2024-03-14 06:01:10 UTC
+--- CMakeLists.txt.orig	2024-10-11 10:00:58 UTC
 +++ CMakeLists.txt
 @@ -174,7 +174,6 @@ INCLUDE_DIRECTORIES(
      deps/cloexec
@@ -49,7 +49,7 @@
  IF (WITH_DTRACE)
      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPICOTLS_USE_DTRACE=1 -DQUICLY_USE_DTRACE=1 -DH2O_USE_DTRACE=1")
  ENDIF ()
-@@ -339,11 +354,6 @@ SET(LIB_SOURCE_FILES
+@@ -339,12 +354,6 @@ SET(LIB_SOURCE_FILES
  
  SET(LIB_SOURCE_FILES
      deps/cloexec/cloexec.c
@@ -58,10 +58,11 @@
 -    deps/hiredis/net.c
 -    deps/hiredis/read.c
 -    deps/hiredis/sds.c
+-    deps/hiredis/alloc.c
      deps/libgkc/gkc.c
      deps/libyrmcds/close.c
      deps/libyrmcds/connect.c
-@@ -497,7 +507,6 @@ SET(UNIT_TEST_SOURCE_FILES
+@@ -498,7 +507,6 @@ SET(UNIT_TEST_SOURCE_FILES
  
  SET(UNIT_TEST_SOURCE_FILES
      ${LIB_SOURCE_FILES}
@@ -69,7 +70,7 @@
      ${BROTLI_SOURCE_FILES}
      deps/picotest/picotest.c
      t/00unit/test.c
-@@ -710,6 +719,10 @@ TARGET_LINK_LIBRARIES(h2o-httpclient libh2o-evloop ${E
+@@ -711,6 +719,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 +81,7 @@
  SET_TARGET_PROPERTIES(examples-socket-client-evloop PROPERTIES
      COMPILE_FLAGS "-DH2O_USE_LIBUV=0"
      EXCLUDE_FROM_ALL 1)
-@@ -788,6 +801,15 @@ TARGET_LINK_LIBRARIES(h2o ${OPENSSL_LIBRARIES} ${CMAKE
+@@ -789,6 +801,15 @@ 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})