diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 9c8001bcca77..c479fdf9372d 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,77 +1,77 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20240411 +DISTVERSION= 2.3.0-dev.20241011 CATEGORIES= www 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= 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 LIB_DEPENDS= 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= 222b36d +GH_TAGNAME= 8398a11 USE_LDCONFIG= YES USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= share/h2o/start_server CMAKE_ON= BUILD_SHARED_LIBS EXTRACT_AFTER_ARGS= --exclude deps/hiredis --exclude deps/yaml/include SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample SUB_LIST= H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} \ H2O_USER=${H2O_USER} 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 OPTIONS_DEFINE= DOCS MRUBY OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes MRUBY_DESC= Build with embedded mruby handler support MRUBY_BUILD_DEPENDS+= rubygem-rake>=0:devel/rubygem-rake MRUBY_USES= bison libtool ruby:build MRUBY_CMAKE_BOOL= WITH_MRUBY .include .if ${ARCH} == amd64 && defined(CPUTYPE) && ${MACHINE_CPU:Mavx2} EXTRA_PATCHES= ${PATCHDIR}/extra-patch-cputype-defined CMAKE_ON+= WITH_FUSION .else CMAKE_OFF+= WITH_FUSION .endif 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/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,98 +1,99 @@ ---- 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 deps/brotli/c/include deps/golombset - deps/hiredis deps/libgkc deps/libyrmcds deps/klib @@ -186,7 +185,6 @@ INCLUDE_DIRECTORIES( deps/picotls/deps/micro-ecc deps/picotls/include deps/quicly/include - deps/yaml/include deps/yoml ${CMAKE_CURRENT_BINARY_DIR}) @@ -257,6 +255,23 @@ ENDIF (PKG_CONFIG_FOUND) ENDIF (LIBCAP_FOUND) ENDIF (PKG_CONFIG_FOUND) +IF (PKG_CONFIG_FOUND) + PKG_CHECK_MODULES(HIREDIS hiredis) + IF (HIREDIS_FOUND) + INCLUDE_DIRECTORIES(${HIREDIS_INCLUDE_DIRS}) + LINK_DIRECTORIES(${HIREDIS_LIBRARY_DIRS}) + ENDIF (HIREDIS_FOUND) +ENDIF (PKG_CONFIG_FOUND) + +IF (PKG_CONFIG_FOUND) + PKG_CHECK_MODULES(LIBYAML yaml-0.1) + IF (LIBYAML_FOUND) + INCLUDE_DIRECTORIES(${LIBYAML_INCLUDE_DIRS}) + 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 () 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\"") 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 - deps/hiredis/async.c - deps/hiredis/hiredis.c - 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} - ${LIBYAML_SOURCE_FILES} ${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}) +IF (HIREDIS_FOUND) + TARGET_LINK_LIBRARIES(h2o-httpclient ${HIREDIS_LIBRARIES}) +ENDIF (HIREDIS_FOUND) + 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}) +IF (HIREDIS_FOUND) + TARGET_INCLUDE_DIRECTORIES(h2o PUBLIC ${HIREDIS_INCLUDE_DIRS}) + TARGET_LINK_LIBRARIES(h2o ${HIREDIS_LIBRARIES}) +ENDIF (HIREDIS_FOUND) + +IF (LIBYAML_FOUND) + 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