git: 9b2894a247cc - main - www/h2o-devel: use 20220208 snapshot with upstreamed patch

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dave Cottlehuber <dch_at_FreeBSD.org>
Date: Tue, 08 Feb 2022 09:13:26 UTC
The branch main has been updated by dch:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f

commit 9b2894a247cc0eb8f292eedff41e39fdf7ca8e8f
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2022-02-08 09:07:34 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
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