From nobody Mon Nov 11 00:28:57 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xmr553r8bz5cVtS; Mon, 11 Nov 2024 00:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xmr552ll7z3x2g; Mon, 11 Nov 2024 00:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731284937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P65v8rNfTmqagnXCTxdSwr4gLdsWtKdb6WO0IAoCki8=; b=BEom0ZEPDWoFpnkG7USblhIhTbFwhLsc1q3uO/1k4R3V69GdGfgHtfJsyupo5EzbLh1u16 2pHimROcENXOSCF4tWPae/grx9u2PMsJHTFkKcQwZn7+jDGX0yjBbx3He2bcEfzD4MaHrJ FXxJdeGeQdfyTVjWuK717St5FxCjjZMks+Ln7KEGQmHmABWObxftnlVfnpzC/kTLvBvCie Z16qjgIIKl53SjS3He4aDvzkg3xu9tic7RdyMty0s0ylpo7LbIxVus2vFjoKERGBi11Su9 83cLtbBLZ463nE7Q9I0HUU7IRZHSU32ryEAoesYvr7QjenxkieWlriJIHnPQNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731284937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P65v8rNfTmqagnXCTxdSwr4gLdsWtKdb6WO0IAoCki8=; b=PcYWqeZfbddoEzYWadKWUXsQoVTy+jU/VDVtAsleqxVn5V+kQpUqQD4PN3lp/2ZIMo8csY A+gyR9sM9lJ++8kB6NGOXcSStZCzBmhGfYdR5gSaqleuGFy9VRxV6CeiWerk/gRVivMnsd Qw8fFaBfwPgmFB237lB8kI8tKopkpKkKdec3Kxx0RxLjLZPOeHF+crsyi2bjG3O/9AStBY odraHFuOWRVitMxttqqBF7jkdngq/IbBlaBDjN7L5g0YeYb1ebIT0s0t1O3ydAZz2LljZW WsRgKPI9xY4IL9UDt79HX1skOIElvS4M/UbFeJEu4bcOxqsp8iLJzYDZKfLY/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731284937; a=rsa-sha256; cv=none; b=n8BlVvQTW8wjd4pyaChTTfPqgzah2X+OZWLnDwAKILeLQdBHO2DZHny8hjg9QXekZNmSPX Ynuoy9U1Zn14z5Z/rg70WVJ48QFfhIghA4pGGoozBhEiQR5F+u1Ln3V/yKZMlKKjKv84JH xwwIcR/Uz+r3FSZ7mhtNsBmAmReaKkUYCy4XSxBov5QkblT+fVp2TgPoxyC8aUwCGbrDUg ZQDmeJ0+kpCtRhDtNZ06Vjej32pwyRfNq6smlV+Zs4OaBr3AId5tHGaoZO2rsuIiP7pnii 7rxHqy7Y4SDaNnOLw6XuTTlpKoKcETPg0zovoOI2vsxl4g3+1gKaCDWzHmNVzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xmr552BwVz13kP; Mon, 11 Nov 2024 00:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AB0Svob067050; Mon, 11 Nov 2024 00:28:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AB0SvCm067047; Mon, 11 Nov 2024 00:28:57 GMT (envelope-from git) Date: Mon, 11 Nov 2024 00:28:57 GMT Message-Id: <202411110028.4AB0SvCm067047@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: af42d952be72 - main - www/h2o: update to 20241011 snapshot List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af42d952be7251c207c3ae6db9fa312d8cfe0878 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=af42d952be7251c207c3ae6db9fa312d8cfe0878 commit af42d952be7251c207c3ae6db9fa312d8cfe0878 Author: Dave Cottlehuber AuthorDate: 2024-11-11 00:28:35 +0000 Commit: Dave Cottlehuber 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})