From nobody Mon Dec 04 21:27:45 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 4SkcFt15WWz52rCm; Mon, 4 Dec 2023 21:27:46 +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 4SkcFs5KBCz4Hp5; Mon, 4 Dec 2023 21:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725265; 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=zjmfhBlqTTI/WK/jykAuVFHV91d0yms4VMZOS4JC/bw=; b=MmnnIf4wtcMgPFk4vJhpU3THL1ygDKS9hs9Zm5cD2oUmW76qRi65FSFBu1Lkxt0YfOzwFD cjiGyqf/tHyGpO5NhKZhJSTBQeZ2XwX/UEvoaDj/2ISo8iLEHhjb3XB4YU4cewiV1EeZ0m BfhFgCogv6tA0Lqwp8IuIsjaC3Asyk5m21/i+LZufpgCGH73gTnOI9bLDeknTvpyhoOSLS KJGz3tOtK/PoAgw0dQk6sQJtA+G1Y0eGFDcs4KDpL8a8onvx40eXOXwrIE9A+mSOIfH5EM 9EBY88Doi6jdqc4t4JImxQlLMaKXosTWqeYGm1uxGTqQ2LVBNOhfvpG/TTBCTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701725265; 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=zjmfhBlqTTI/WK/jykAuVFHV91d0yms4VMZOS4JC/bw=; b=xrv2lUvDhQDzQ9p0rmypkIugraza6C4MCfHqK2Jw56YDLEBqNsf1zdFcCv/U6glIFRhK+G vMyQW5/X1yx0tR8uHRBBdyKxyDBCQSRG2Aegu8t5PAZHMwITKe9Li2HAsaYeSsSJGxaX2s a1AaKs3we7LJCV3ennfPah1YhRLGdis2HwxJKCoR8D+aKZdkz5hn+3S6ltflQpwnzt1Xyi bSHX7UUsGq5Of0ff+3OK8nmWLfT0EQ4qdO2e/R45FmnDsV8GtkMyZh86e2I2/NJH9+SEND gaF/KEdtqBJ/X/8YJNuR2SdfMaSXUpK7o59CQkc8+a7JH03QiKVh38GJNAmh1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701725265; a=rsa-sha256; cv=none; b=EIpUgQZg49QEKfkCCi3bU5qNh8G/U5TEqGIjt69fLfFE7zaYhyNbX+MYW9c6JalmaeQcmc L4IWyYdIoslUzFBV/ZophHtk/4lL+SB0ZQmKDzk8D4/3IaEKWETsxNND/67DDfmJlS/oZQ n2sb8nWT6+RXsJJOX3A6/r63K0KKFZBR4Mr0xOsIADmYfi6uKuBW9NsU5XdAd+FEk/F+oh QwBvWil76Qz8auBCUNSPPK3jySFH9RVZt5Ls2V90ReCj2tpIL03atY/fbZh6vU+spPTDuC TO4Gbh8gSZa59CbTtk1gKRLSpwT0RS9M4LJoeMkXETzFUjOGQSeoowSE3vjUdg== 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 4SkcFs46cfzjRy; Mon, 4 Dec 2023 21:27:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4LRj28095356; Mon, 4 Dec 2023 21:27:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4LRjXt095353; Mon, 4 Dec 2023 21:27:45 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:27:45 GMT Message-Id: <202312042127.3B4LRjXt095353@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 074a917cec08 - 2023Q4 - www/h2o-devel: update to 20231107 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 074a917cec084d0e86cee1cbadcaed696c9fe98f Auto-Submitted: auto-generated The branch 2023Q4 has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=074a917cec084d0e86cee1cbadcaed696c9fe98f commit 074a917cec084d0e86cee1cbadcaed696c9fe98f Author: Dave Cottlehuber AuthorDate: 2023-11-11 22:45:41 +0000 Commit: Dave Cottlehuber CommitDate: 2023-12-04 21:26:52 +0000 www/h2o-devel: update to 20231107 snapshot - fix i386 builds (cherry picked from commit 98838077216800459aa19d9954fd8fd6407cf35d) Reported by: pkg-fallout --- www/h2o-devel/Makefile | 17 +++++++++++------ www/h2o-devel/distinfo | 6 +++--- www/h2o-devel/files/patch-deps_quicly_lib_quicly.c | 10 ++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/www/h2o-devel/Makefile b/www/h2o-devel/Makefile index 9b5433ffc2b8..49d731d58d6b 100644 --- a/www/h2o-devel/Makefile +++ b/www/h2o-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v -DISTVERSION= 2.3.0-dev.20230817 +DISTVERSION= 2.3.0-dev.20231107 CATEGORIES= www PKGNAMESUFFIX= -devel @@ -21,14 +21,14 @@ LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl CPE_VENDOR= dena USE_GITHUB= yes -GH_TAGNAME= 70dd2d8 +GH_TAGNAME= b15937e + USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= share/h2o/start_server -CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF \ - -DWITH_BUNDLED_SSL=OFF +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=OFF CONFLICTS= h2o @@ -53,10 +53,15 @@ OPTIONS_DEFINE= DOCS MRUBY OPTIONS_DEFAULT= MRUBY OPTIONS_SUB= yes MRUBY_DESC= Build with embedded mruby handler support - MRUBY_USES= bison ruby:build MRUBY_CMAKE_BOOL= WITH_MRUBY +.include + +.if ${ARCH} == i386 +CMAKE_ARGS+= -DWITH_FUSION=OFF +.endif + .include post-install: @@ -70,4 +75,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/www/h2o-devel/distinfo b/www/h2o-devel/distinfo index 74dbcc4f6cff..2ba3cd8e0770 100644 --- a/www/h2o-devel/distinfo +++ b/www/h2o-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693558446 -SHA256 (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 075f1da946b4fe32792b3f97e9ac44463febbef6235533d59a5c4bc53bc8c09d -SIZE (h2o-h2o-v2.3.0-dev.20230817-70dd2d8_GH0.tar.gz) = 30555369 +TIMESTAMP = 1699740447 +SHA256 (h2o-h2o-v2.3.0-dev.20231107-b15937e_GH0.tar.gz) = 3d70ad17d24f9e8ec575c235004f22ef3cf4d2c93f95f351928d05cbc5ed0c76 +SIZE (h2o-h2o-v2.3.0-dev.20231107-b15937e_GH0.tar.gz) = 30565861 diff --git a/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c b/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c new file mode 100644 index 000000000000..b105a79ab8bb --- /dev/null +++ b/www/h2o-devel/files/patch-deps_quicly_lib_quicly.c @@ -0,0 +1,10 @@ +--- deps/quicly/lib/quicly.c.orig 2023-11-11 22:44:34 UTC ++++ deps/quicly/lib/quicly.c +@@ -21,6 +21,7 @@ + */ + #include + #include ++#include + #include + #include + #include