git: 24f8b2428429 - main - www/h2o-devel: update to 20210131 snapshot for CVE-2021-43848

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dave Cottlehuber <dch_at_FreeBSD.org>
Date: Wed, 02 Feb 2022 12:48:55 UTC
The branch main has been updated by dch:

URL: https://cgit.FreeBSD.org/ports/commit/?id=24f8b242842944c4eec075125a2f9d7a176da8cc

commit 24f8b242842944c4eec075125a2f9d7a176da8cc
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2022-02-02 12:18:07 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2022-02-02 12:48:14 +0000

    www/h2o-devel: update to 20210131 snapshot for CVE-2021-43848
    
    Differential Revision: https://reviews.freebsd.org/D34129
    
    Security:       CVE-2021-43848
---
 www/h2o-devel/Makefile  | 10 ++++++----
 www/h2o-devel/distinfo  |  8 +++++---
 www/h2o-devel/pkg-plist |  8 +-------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile
index 8c4b80c1fd1f..62eaff007615 100644
--- a/www/h2o-devel/Makefile
+++ b/www/h2o-devel/Makefile
@@ -2,10 +2,13 @@
 
 PORTNAME=	h2o
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0-beta2.20210611
+DISTVERSION=	2.3.0-dev.20220131
 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
 
@@ -21,9 +24,8 @@ LIB_DEPENDS=	libuv.so:devel/libuv
 USES=		cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
 CPE_VENDOR=	dena
 USE_GITHUB=	yes
-USE_PERL5=	run
 USE_LDCONFIG=	yes
-GH_TAGNAME=	96bf0ef
+GH_TAGNAME=	a68cabae
 
 CONFLICTS=	h2o
 
@@ -52,7 +54,7 @@ OPTIONS_DEFAULT=	MRUBY
 OPTIONS_SUB=		yes
 MRUBY_DESC=		Build with embedded mruby handler support
 
-CMAKE_ARGS+=		-DBUILD_SHARED_LIBS=ON -DWITH_BUNDLED_SSL=OFF
+CMAKE_ARGS+=		-DBUILD_SHARED_LIBS=OFF -DWITH_BUNDLED_SSL=OFF
 
 MRUBY_CMAKE_BOOL=	WITH_MRUBY
 MRUBY_USES=		bison
diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo
index 50c21d70cd8e..61625a9e91c3 100644
--- a/www/h2o-devel/distinfo
+++ b/www/h2o-devel/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1623414836
-SHA256 (h2o-h2o-v2.3.0-beta2.20210611-96bf0ef_GH0.tar.gz) = 8a0e8e993a26caf3ea0f10aea26aea62a74a768cbd4e43f3e885974e45ae644e
-SIZE (h2o-h2o-v2.3.0-beta2.20210611-96bf0ef_GH0.tar.gz) = 30020918
+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
diff --git a/www/h2o-devel/pkg-plist b/www/h2o-devel/pkg-plist
index 57292701c580..e252c9298c02 100644
--- a/www/h2o-devel/pkg-plist
+++ b/www/h2o-devel/pkg-plist
@@ -20,9 +20,9 @@ include/h2o/http2_casper.h
 include/h2o/http2_common.h
 include/h2o/http2_internal.h
 include/h2o/http2_scheduler.h
-include/h2o/http3_server.h
 include/h2o/http3_common.h
 include/h2o/http3_internal.h
+include/h2o/http3_server.h
 include/h2o/httpclient.h
 include/h2o/linklist.h
 include/h2o/memcached.h
@@ -48,12 +48,6 @@ include/h2o/tunnel.h
 include/h2o/url.h
 include/h2o/version.h
 include/h2o/websocket.h
-@comment lib/libh2o-evloop.so
-@comment lib/libh2o-evloop.so.0.16
-@comment lib/libh2o-evloop.so.0.16.0-beta2
-@comment lib/libh2o.so
-@comment lib/libh2o.so.0.16
-@comment lib/libh2o.so.0.16.0-beta2
 libdata/pkgconfig/libh2o-evloop.pc
 libdata/pkgconfig/libh2o.pc
 man/man5/h2o.conf.5.gz