From nobody Tue Feb 08 09:13:26 2022 X-Original-To: dev-commits-ports-main@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 2EB2719BEE94; Tue, 8 Feb 2022 09:13: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 4JtHP30nXHz4VLd; Tue, 8 Feb 2022 09:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644311607; 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=asfzXjwVVG6sbYBfv68ZJoStK32TOhSwbk5N/bmLSwE=; b=oAPP1RFhPzaiQDqVCZhBKxluR+F0ZF8bH94M8/HS5YwtEZtcWRFHUaiDVrXK7CMXbbKFkl KpsJRsYcCoMZqSknYDYnZBvMeaEsXTh8Mkq82lb/ldFULgFsPeP9r3DqJj0HMIFpecFmoe NAQa3HFxZh+ky2RdXkuWJAm/PBHXm5dWcKbDQmLXBOhBqglYCdKk2qo5kCZ6mxVsZb4us+ PBOLH3FvQnXL+psdb/qqcRCXcopcav3vXH9mFI8v6IeuNnTvwRqIM5tCpnmB5RDuXJKVIx qx4mk6F9yYeKwNCvKSN3pjLaYFPyvvVso1USGOg5yAjKfEVMbE+wQSi1MQq+qA== 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 EEEA916D97; Tue, 8 Feb 2022 09:13:26 +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 2189DQv8040472; Tue, 8 Feb 2022 09:13:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2189DQtm040471; Tue, 8 Feb 2022 09:13:26 GMT (envelope-from git) Date: Tue, 8 Feb 2022 09:13:26 GMT Message-Id: <202202080913.2189DQtm040471@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: 9b2894a247cc - main - www/h2o-devel: use 20220208 snapshot with upstreamed patch List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644311607; 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=asfzXjwVVG6sbYBfv68ZJoStK32TOhSwbk5N/bmLSwE=; b=e9yth8d3PNtF+g1Mo5M5GG08bdHOJmx/TyHv6eCniZ9HYdHkgCQCZ06jaBZJTIacXmKcqh O0wuJHFA+ko3Z8jlcPQoJTq3OId22nSkv8PGOgvuU94sgP2ykHQT7/Pip8EprADTApxd+a Sl7GDUPwhKshuuSl2BFX+Bc1MfK/z7oKgzocNr2WyFllVIknYgVmaKeKIqtfX6U1I4W+9S YpdzEqtwnT7ZSSwZxPd9rGTrOqy8ubKiAYcF3xrQHQHRbzRyk7mj1wfVVNmflGW3BNSsqM KrLwQasZkYKM1mkt/zvJk9qa8/+ywHpwuMmrhXxoMbW0S8OUsxla1v01qf/jWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644311607; a=rsa-sha256; cv=none; b=EwrN1CGvL1mBWjnCMSZZmdrHpp298b492BCR6NNbKhor5Y4QUODemr1YzUG5M5Xoa1NzXu gRjUwrA9iocXT58YzqYg3au/LGJFRAHu1MdMcwo2sUox6CDkdz6y2iClDBWJepeu0qgmEU 9jGnWwRZIz6cQwAyKPRBSVAmFKi7M/1NZfdr9RQg6nOV5VAXnsIzlZ/D5SVKZP64PwALxA GYIi8CtT8IhS4pOingZeSlC7OZ4h75aeN3wyXV6olBFBekcQKf+xjZA+j+EOv/oNBnApUL zNMikacfOIEq9h9pyiIHN6vQ0IxAghGelyEFfniCk/tb7Axf83Gn5aag3i87ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f commit 9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f Author: Dave Cottlehuber AuthorDate: 2022-02-08 09:07:34 +0000 Commit: Dave Cottlehuber CommitDate: 2022-02-08 09:11:53 +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 --- 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 62eaff007615..6917f9a73ac9 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 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