From nobody Wed Feb 2 12:48:55 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 674FF18E61CE; Wed, 2 Feb 2022 12:48:56 +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 4JphSS09W7z4TTY; Wed, 2 Feb 2022 12:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643806136; 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=gZpTuJ3Xa7cvEg0Y+xgzSK9ssQQUEkWGphxU79eQ/DM=; b=I9WDeDY8IKMZf6e3Fy5Y24226Rj3xfCblT7U+ihYWYQImzx0ED/Hx/HFvXDTw6sMeYvrHx t3WSvYEW+XA2l8QRsA37f1+S6u6SKWlX2t+UDWEIYzhiqBH9SaDHS/eXkH+uSk3DcIc3Ry 7MQcj/MqjgttL8zjwnF3UsUV+vmnFO/ersWBMlsW1wffkKhWKthl+vm2vXf5zj8Rdvi+H/ AOdI8/7ff3GeBaoABGMd4wxgGM/kHglXJuw7yR/X7W2HB9NZMXWFcFcz0g/YXe2dt05MRo OQeXAEMo/IAflDZKKDKF+UqPqKSx4+/Ulkszvb2yvPcCOubGi0yKJ9YuFCyQgg== 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 BBD942461E; Wed, 2 Feb 2022 12:48:55 +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 212Cmt0g063787; Wed, 2 Feb 2022 12:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212CmteK063786; Wed, 2 Feb 2022 12:48:55 GMT (envelope-from git) Date: Wed, 2 Feb 2022 12:48:55 GMT Message-Id: <202202021248.212CmteK063786@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: 24f8b2428429 - main - www/h2o-devel: update to 20210131 snapshot for CVE-2021-43848 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: 24f8b242842944c4eec075125a2f9d7a176da8cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643806136; 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=gZpTuJ3Xa7cvEg0Y+xgzSK9ssQQUEkWGphxU79eQ/DM=; b=A4LlExz6l+O5NNMSDySUqrwowVkxeiMuc0xi358bxg6L8WYsD7ZNZKd54zt4xez6rKtE0G NKzx6zqD4XQBGFpNM+cru0am49zMmwOWlI8Z872+OTgSsq6hZjYtYUAGws40rZIfvldtIU u6wNDX2pRsVX6/jDdyPOdXpDfND1nQRn3r+NSGT8Sg7Q/8t+z95WyEZYxaMuryI8wPpJi2 u8r+jTchlGmjo25ZV3UJ4uZDJk6IoB+48MgCxH8fEgUX5Btti9zutT9LRLWtyJrIiG4C7c 6WVfEhpf5MPQ+FLTS38dT3rWpDu2Zvv2xWXew6K2T/QntVkhfWAFaw2gCCaQHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643806136; a=rsa-sha256; cv=none; b=RCIy/yfQQApZKCO6CIZHS5AuEhrA0WMRh8a+ULDIMDLmXYaAotNq2SlwpqbbLgM/O8Rhds crnMrbHlKJKEoPC6KFoaloAyKmazmRfNeaSS6bXKbggpr5QCphtBtzVu//oFp6CyKKLkaR qpOfGvwRSHEFTP8Rhh4Rxe1R8yzVOKezYhZh2T+EY3Z9VPMMmRLDRUdfxfkXNvXKQtprE3 Uz1HETdO1jhyNydAR8h6Q7xfgP3tEogenNhYY9iedXYv1QLiQ0DMhDBnvWrnIFej7J8qf8 7MLabMaBhkYETHcek6svF14WLB8HS2C+sLkOai+jjn727rMSLLTVoeaAKrk6ZQ== 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=24f8b242842944c4eec075125a2f9d7a176da8cc commit 24f8b242842944c4eec075125a2f9d7a176da8cc Author: Dave Cottlehuber AuthorDate: 2022-02-02 12:18:07 +0000 Commit: Dave Cottlehuber 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