From nobody Tue Feb 8 09:14:48 2022 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 06A7F198897B; Tue, 8 Feb 2022 09:14:49 +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 4JtHQc6gyGz4WM4; Tue, 8 Feb 2022 09:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644311689; 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=WxK2VhoT5OB+XGYzrS36GJvmcx1ukrmeNEyDWK5r+uA=; b=AQYS02DLo5C9pQY++Elw1ZNEOaDQSaRl9biulZDPUect+w3jAqKm5XBFRwBWVfLZAIQfBU eEvnIsxYKMWoT6xQKXLK+41KO66z3vVRDGo+Yoh3muzySWPhjMO/16C3EIx2SGLxljNn5E i4anHPhdpmmbqco5YaRIYUu17fTze8nJBVNcSYOhivsY6XmsoyEgdGv7u83AB6GebTeScc PnWFfiVhcBQgz2d6lj8jAeYhVtLsbklgsUcKOCzlqv4k3Jk4SEo5gckl2UpJJLyke/iuN9 PgBuMBlJbfMACThVlhco6IitruvF/c9IltlVLPjgk3UTxRR/HIIHa/ryulaC2w== 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 C5F6B16D99; Tue, 8 Feb 2022 09:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2189Em97040695; Tue, 8 Feb 2022 09:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2189EmLQ040694; Tue, 8 Feb 2022 09:14:48 GMT (envelope-from git) Date: Tue, 8 Feb 2022 09:14:48 GMT Message-Id: <202202080914.2189EmLQ040694@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: db3e514b5af3 - 2022Q1 - www/h2o-devel: use 20220208 snapshot with upstreamed patch 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: db3e514b5af391929b6d80b912d618a732bb1b2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644311689; 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=WxK2VhoT5OB+XGYzrS36GJvmcx1ukrmeNEyDWK5r+uA=; b=V7HFM9rTvWsW/iiASZBk8HJBfpWeND5eFJAKCjVYDwTiZXIuv42DM+tRGjbgh6FlZwkmuN cuqp6iQkeC7s7vvWP4bilBswIS5ReOjr09QVtxg47Sn9wUmN+gQDkBZEZs9ZU/0kL8A0EU FOhjenxxyy4CbTFMHIenGwZuAcrU/RQvZ5RAU+XCt4bLaQ3Z5OK0KLaZrztnofeu04/6N9 xe9JRNAfqehSCEg6+tyEd4uDnBKhoyb1p4WnXQ27t9WPCI3YxYGnUuzhLAeJF9klDFHe6z Hybo6kMvfhpIRtmHQyMTZ5PfwpCnIsfnnOimN8WmNxPT9Ld6xLa+VzvhlG4/8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644311689; a=rsa-sha256; cv=none; b=M1RckNvcVa6mcbFwrkf7PIyDvgBqIPbX8xT+WyvBjx68SX0FW2sx3EZz7g0+AvTiJrWkXN 0tD4ZNVVQgHdHZk1ehzcG/SSKPcxnnLlYHGLvi/qk+otMceao+nHPuZnxdd3nBg1RIK2Vn RAz7McouQI4DOlckDlr/ypVg16dAhkR2Gn8vFLB9LHL4xnqPoedxJOmk60ljAYwfKZNpEp GSnwUXhAzLPkrI03DVQILU6h25EO3rUOurmDYL/4QwszlzO0HkcaXO3/Y+19Z0aKWWZ1ME GAx4DvNwlTalmgHGi29U8CAJxmX8wMVWjzh4UzzBNN/9dpCPxbrq9iFUVnrl1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=db3e514b5af391929b6d80b912d618a732bb1b2b commit db3e514b5af391929b6d80b912d618a732bb1b2b Author: Dave Cottlehuber AuthorDate: 2022-02-08 09:07:34 +0000 Commit: Dave Cottlehuber CommitDate: 2022-02-08 09:14:15 +0000 www/h2o-devel: use 20220208 snapshot with upstreamed patch A local patch was used to address the vuln immediately on release, and together with upstream committers this improved patch was merged. No vuxml changes are required. MFH: 2022Q1 Security: CVE-2021-43848 Sponsored by: SkunkWerks, GmbH (cherry picked from commit 9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f) --- www/h2o-devel/Makefile | 7 ++----- www/h2o-devel/distinfo | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 69be872a0c6f..c77877265d15 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -2,13 +2,10 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20220131 +DISTVERSION= 2.3.0-dev.20220208 CATEGORIES= www PKGNAMESUFFIX= -devel -PATCH_SITES= https://github.com/h2o/h2o/pull/ -PATCHFILES+= 2934.patch:-p1 - MAINTAINER= dch@FreeBSD.org COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x @@ -25,7 +22,7 @@ USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig CPE_VENDOR= dena USE_GITHUB= yes USE_LDCONFIG= yes -GH_TAGNAME= a68cabae +GH_TAGNAME= 34a5ac2 CONFLICTS= h2o-2* diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo index 61625a9e91c3..22237520938f 100644 --- a/www/h2o-devel/distinfo +++ b/www/h2o-devel/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1643753281 -SHA256 (h2o-h2o-v2.3.0-dev.20220131-a68cabae_GH0.tar.gz) = 8c9bad139b32e00e4666b0eb8cc78832c82391abd3f7d54aeb65a41d2df49309 -SIZE (h2o-h2o-v2.3.0-dev.20220131-a68cabae_GH0.tar.gz) = 30098653 -SHA256 (2934.patch) = 9119b6eb0cf3d8af36f9a94a88ffeed480c0e84c56c14d51c2d6d7ec55a5cca4 -SIZE (2934.patch) = 2985 +TIMESTAMP = 1644311187 +SHA256 (h2o-h2o-v2.3.0-dev.20220208-34a5ac2_GH0.tar.gz) = 516f0deef27c6c09c261902b788ac01e387f6cdb556d3b5fd278a7d3f01a1fbc +SIZE (h2o-h2o-v2.3.0-dev.20220208-34a5ac2_GH0.tar.gz) = 30112859