Date: Sun, 30 Apr 2023 20:21:03 GMT From: Dave Cottlehuber <dch@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 61e3bf37fbb2 - main - www/h2o-devel: remediate CVE-2023-30847 via 20230427 snapshot Message-ID: <202304302021.33UKL3Lb003698@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=61e3bf37fbb29a0a97d0a6e9cb43ca7d24f2ed57 commit 61e3bf37fbb29a0a97d0a6e9cb43ca7d24f2ed57 Author: Uwe Trenkner <uwe@trenknerconsulting.com> AuthorDate: 2023-04-30 14:08:27 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> 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 <uwe@trenknerconsulting.com> 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 - - ##############################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304302021.33UKL3Lb003698>