From nobody Sat Oct 28 22:25:26 2023 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 4SHvHW3ZYnz4y7DQ; Sat, 28 Oct 2023 22:25:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHvHW1KP9z4f4Y; Sat, 28 Oct 2023 22:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698531927; 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=/FCJ1nQhKBfdvMlL8/Z6IY3dPZwmadgO4J7QHF+w0qo=; b=laSTpA2J83EZO9jiJVn0mEGGUwLttMfv3ZKmO6fo7quN1jed04Mk20Wvph1r0yJeeIUS2z +5Ukv2oO1q6umME4JFMbABXSXxU6Rys1FJS66z1y7/V33SG5rhCXKlrSLtGsV/K3zi39qC 8PvsrZHXudxnGbabwuv8Fdk5D8LSovR07ARTyCwIFAjoPDgYddNl6mJY5y6RuRiNWHZTY9 PJPpq1FPBBQNGwpF9CK2hk7d+5MoKXnFX7gaYcNfB2ECkMqtm4eISqo4GJBElFmrDILmKZ E0IlH+B5cvlsiZu0dm0ZNh29GhhYJJvKoF2y9DV/AYH6mN2GJWbJ4NRxZ3EfXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698531927; 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=/FCJ1nQhKBfdvMlL8/Z6IY3dPZwmadgO4J7QHF+w0qo=; b=LrKSrMTnJMopP4sKraawNlOkIu6QnpCX9CdLVA1d6WApJ42jCQgSfRE/ZGx2iMG7h0GEEq 9HBsecqbmyFys5oaSB3qz9oS7ugYTezLGjFrkmblYTJjmuygmBXIDy8DYIfIGpgLtmqvXe UD4iKEBzWCLgbahdaBzzAezzQK4GqehOiyxqpIRUD5F4JsUTz1G1C+0TaoyDgyUNzEFVms 5gNVWJp+d40uZJH3w079VFUdrlZz1HS3t9pltvNA67bB1DBonN+h5SOyc6pxQjl5RPcERs PYP6rJDGjsX4yceIhd7Gy9l4FH89OBrnl0z4zBCg64L5RKe9/Ku7B7Yz/766sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698531927; a=rsa-sha256; cv=none; b=x2hKehFg5oaCAan8sHDhK1tsVddcv3C+QpoWYCgML//mzpCMRiYH21GQoJQQSkHt9c+mxl wDub5KfhviZ3mwNsw51NUZZb18/t6MPveyPeF3zmdFcd7FPiLAe5h+PyUxvo1KCn9Z591d ZO5DTkYT15RbSRaeDrfWzFOE3SKQkL1Gim7ClrSyAN3xqKBO0s1sl0Ot8Xw0zCol9DGlxM 86j/hjDZc/Hb9IlejwikwuSfUbZ4G+D5dmBqegled2oCNHecHVEPk2qh39Iuu6FikcNEp8 giVuMcXlaevoJB3YJIxff9Sz+HqG0bKmwPlK/S7TmO2JrvfbtWyzIErnRM7BKQ== 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 4SHvHW0NjgzG7; Sat, 28 Oct 2023 22:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39SMPQI6078246; Sat, 28 Oct 2023 22:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SMPQwI078243; Sat, 28 Oct 2023 22:25:26 GMT (envelope-from git) Date: Sat, 28 Oct 2023 22:25:26 GMT Message-Id: <202310282225.39SMPQwI078243@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: d225b5157f7b - 2023Q4 - www/h2o: patch for HTTP2 rapid reset attack, deprecate 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: d225b5157f7b3f9aef8e33b1326675c27011a62e Auto-Submitted: auto-generated The branch 2023Q4 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=d225b5157f7b3f9aef8e33b1326675c27011a62e commit d225b5157f7b3f9aef8e33b1326675c27011a62e Author: Dave Cottlehuber AuthorDate: 2023-10-28 22:13:46 +0000 Commit: Dave Cottlehuber CommitDate: 2023-10-28 22:24:32 +0000 www/h2o: patch for HTTP2 rapid reset attack, deprecate - downstream dnsdist project has backported a fix for this specific issue - deprecation is still planned, and port should not be considered secure - pet port in line with www/h2o-devel See https://github.com/h2o/h2o/pull/3293 for further details Obtained from: Remi Gacogne Security: CVE-2023-44487 Security: https://github.com/h2o/h2o/security/advisories/GHSA-2m7v-gc89-fjqf (cherry picked from commit dcd7c23bd4dd801ec1a5a415612a66cb97032dde) --- www/h2o/Makefile | 28 +++++++++++++++------------- www/h2o/distinfo | 4 +++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 3dedc789309a..1cd762f288ac 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,9 +1,12 @@ PORTNAME= h2o DISTVERSIONPREFIX= v DISTVERSION= 2.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www +PATCH_SITES= https://github.com/h2o/h2o/pull/:github +PATCHFILES= 3293.patch:-p1:github + 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 @@ -11,6 +14,7 @@ WWW= https://github.com/h2o/h2o LICENSE= BSD2CLAUSE MIT LICENSE_COMB= multi +DEPRECATED= Upstream EOL confirmed on 2023-10-10, removal planned for 2023-12-30 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 BROKEN_FreeBSD_12_powerpc64= fails to link: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6' @@ -18,17 +22,18 @@ BROKEN_FreeBSD_12_powerpc64= fails to link: unrecognized option '-Wl,-rpath=/usr LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl +CPE_VENDOR= dena USE_GITHUB= yes -USE_PERL5= run USE_LDCONFIG= yes - -CPE_VENDOR= dena - -CONFLICTS= h2o-devel +USE_PERL5= run +USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= share/h2o/start_server -PORTDOCS= README.md +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \ + -DWITH_BUNDLED_SSL=OFF + +CONFLICTS= h2o-devel SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample SUB_LIST+= H2O_GROUP=${H2O_GROUP} \ @@ -39,23 +44,20 @@ PLIST_SUB= H2O_GROUP=${H2O_GROUP} \ H2O_LOGDIR=${H2O_LOGDIR} \ H2O_USER=${H2O_USER} +PORTDOCS= README.md + H2O_USER?= www H2O_GROUP?= www H2O_LOGDIR= /var/log/${PORTNAME}/ -USE_RC_SUBR= ${PORTNAME} - OPTIONS_DEFINE= DOCS MRUBY OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes MRUBY_DESC= Build with embedded mruby handler support -CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \ - -DWITH_BUNDLED_SSL=OFF - -MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison ruby:build +MRUBY_CMAKE_BOOL= WITH_MRUBY post-patch: @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ diff --git a/www/h2o/distinfo b/www/h2o/distinfo index e8e1ea81bb8a..cc5d472a2c6c 100644 --- a/www/h2o/distinfo +++ b/www/h2o/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1565781060 +TIMESTAMP = 1697026111 SHA256 (h2o-h2o-v2.2.6_GH0.tar.gz) = f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201 SIZE (h2o-h2o-v2.2.6_GH0.tar.gz) = 16257760 +SHA256 (3293.patch) = 4e093c92840dd82df3e90868f7e957087f1631cea0fd67892e87b10445277c91 +SIZE (3293.patch) = 10243