From nobody Sun Apr 30 20:21:03 2023 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 4Q8d5W3XMBz48G70; Sun, 30 Apr 2023 20:21:03 +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 4Q8d5W36Msz442K; Sun, 30 Apr 2023 20:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682886063; 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=ChSdPdLM1K6T9LAgBqmFm4PNYJb8hX6UQZ5jb3wswFc=; b=QxX57+GPmxZqtB+CqzCPHdBHwqoEbAMc75kOp5oCBQ3P/OlMSu20L+HcNaAWK8/HVzaxFJ 1HM81qBZz9NmvM9c2Q4dDBUsR4qRLlVWn3w3L9CpqKZDDymCWxYCJJz3rr+afFC9u4F82m BIlQd6yviBUBbigex5dJGfKvPGCmky/Dti1QIZjBXVEWDIu5sh8X0fSvKdkTZA7bVjgxn1 iZ1QQKSKUR96vindb7/yRkuB2tspYJdd62Wenxo6NqXe+JYNRzG3bPjH762vlNHMBvt6lh wvUHuiz9aypVaPVS/qrMI6rsoxqqjGeLhtEaZhSAXKHbPx7RKBDCoiq60UtYpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682886063; 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=ChSdPdLM1K6T9LAgBqmFm4PNYJb8hX6UQZ5jb3wswFc=; b=h8n/c+kkroRPHYIFyzTlk9r2dzmtkFX0GmqV09778UfO3IRc8WFaIQDdtBDDsa2pdwLd2j xA7Dj8CNoPiC9/ZLKYzjFjiRaxY5408RUny/bFAmDP4Rj81Q6nRx0uQPvkeAhZC0j9qW2Y XoaY9OXntmfOxv3IDv8PPWLXoQUcDhUCVV19+JLi7W9gflfenQa80PefMG87PhZIF4RVwN onOdlnWRaDIcLX/dpJlODH87ZHCo0lLkYxftZg6CefFumfbSoQmU6QR9QJsVTpXv9ik1N6 sTJltueuI/lG7OpHbzRhsBIsgHfrBnIaqBFHQAXH8Aqx2HJnQEltprTyXrfbpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682886063; a=rsa-sha256; cv=none; b=l2o0sOyYbXWcXgpEbAwasDNaIuOfJQxA78eGFsjIh4qpWDuvtMP3F0yW+7p2nPRNNGRyNS vEgU01TPuW7wcWr08UzMSPtOElIGYXoyGD7nkkxlGjQY2O6wXTX0w/GL3PFlgQbku7fP70 8xsKlfNRLSxZXpXkqd1z+dpk8MEZuthz2i1Qu2p57GjceQJF+kFslbA5DlUpxVHozPG5oz rpy+hwVZrRJaBLsaHOwQ4jaOmMwL6B5LlkxOLUH5xzwvrmAGyQ8TIRrbONoI3MimoSVGRL Ly6m0UUmVSiG4xIpYa+fg/NuIDP/8kWtdY7JgTD581Z2k+n60wRbYhhclPBYuQ== 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 4Q8d5W1zr4zd6P; Sun, 30 Apr 2023 20:21:03 +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 33UKL3M1003699; Sun, 30 Apr 2023 20:21:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UKL3Lb003698; Sun, 30 Apr 2023 20:21:03 GMT (envelope-from git) Date: Sun, 30 Apr 2023 20:21:03 GMT Message-Id: <202304302021.33UKL3Lb003698@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: 61e3bf37fbb2 - main - www/h2o-devel: remediate CVE-2023-30847 via 20230427 snapshot 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/main X-Git-Reftype: branch X-Git-Commit: 61e3bf37fbb29a0a97d0a6e9cb43ca7d24f2ed57 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=61e3bf37fbb29a0a97d0a6e9cb43ca7d24f2ed57 commit 61e3bf37fbb29a0a97d0a6e9cb43ca7d24f2ed57 Author: Uwe Trenkner AuthorDate: 2023-04-30 14:08:27 +0000 Commit: Dave Cottlehuber CommitDate: 2023-04-30 20:20:46 +0000 www/h2o-devel: remediate CVE-2023-30847 via 20230427 snapshot - https://github.com/h2o/h2o/security/advisories/GHSA-p5hj-phwj-hrvx Obtained from: Uwe Trenkner Security: CVE-2023-30847 Sponsored by: SkunkWerks, GmbH --- www/h2o-devel/Makefile | 5 +++-- www/h2o-devel/distinfo | 6 +++--- www/h2o-devel/files/patch-deps_mruby_Rakefile | 16 ---------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 6439dca4eeb8..15a9a7505acd 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20220519 +DISTVERSION= 2.3.0-dev.20230427 CATEGORIES= www PKGNAMESUFFIX= -devel @@ -15,13 +15,14 @@ BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assem BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported BROKEN_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6' +BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig CPE_VENDOR= dena USE_GITHUB= yes USE_LDCONFIG= yes -GH_TAGNAME= cf59e67 +GH_TAGNAME= f010336 CONFLICTS= h2o SHEBANG_FILES= share/h2o/start_server diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo index 997e44227414..d915bed709d4 100644 --- a/www/h2o-devel/distinfo +++ b/www/h2o-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653328775 -SHA256 (h2o-h2o-v2.3.0-dev.20220519-cf59e67_GH0.tar.gz) = 04c63ecb997441bfee036dbb1ab75562f4b6ef38b2aab3ada2cba7d029208eec -SIZE (h2o-h2o-v2.3.0-dev.20220519-cf59e67_GH0.tar.gz) = 30128232 +TIMESTAMP = 1682863965 +SHA256 (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = d8668a6687340e8af56ce997fd36687ff4c41d86d8d195eb6dff8b46e746b3ff +SIZE (h2o-h2o-v2.3.0-dev.20230427-f010336_GH0.tar.gz) = 30505376 diff --git a/www/h2o-devel/files/patch-deps_mruby_Rakefile b/www/h2o-devel/files/patch-deps_mruby_Rakefile deleted file mode 100644 index 385ba00b3289..000000000000 --- a/www/h2o-devel/files/patch-deps_mruby_Rakefile +++ /dev/null @@ -1,16 +0,0 @@ ---- deps/mruby/Rakefile.orig 2022-04-27 17:08:45 UTC -+++ deps/mruby/Rakefile -@@ -33,10 +33,9 @@ def install_D(src, dst) - load "#{MRUBY_ROOT}/tasks/gitlab.rake" - - def install_D(src, dst) -- opts = { :verbose => $verbose } -- FileUtils.rm_f dst, opts -- FileUtils.mkdir_p File.dirname(dst), opts -- FileUtils.cp src, dst, opts -+ FileUtils.rm_f dst, verbose: $verbose -+ FileUtils.mkdir_p File.dirname(dst), verbose: $verbose -+ FileUtils.cp src, dst, verbose: $verbose - end - - ##############################