From nobody Sun Nov 13 12:39:06 2022 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 4N9Bp31rV7z4fc0t; Sun, 13 Nov 2022 12:39:07 +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 4N9Bp31J5hz4QSb; Sun, 13 Nov 2022 12:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668343147; 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=P6H0kj1OYZGwHhxwW9/Zx7uKu4qQM6HeJ+7cl63a9Ko=; b=x/hzK4elnBA54kW58suq2GiKDyHaTOMUkPIlgqlrcByAKB6diZ9SSSvCJ7q0gwSLr2LdJ5 /t3aVVjiEbWPm1B78HBLuH6DdWBJyboPMG5LTlR+ZpkJFtUWnU/DbhlZcFCfYkqJs5zW2J T8RDcLzB6txF3HvETyoulLOvIb6REPcQ+QnZseQGRzcn0nPXQ9btJobmB9RzpzbUzUD14X /jabZ77I/HWUMSbRK8gPmQxOknItBQw1JjgnSbw3BeMhiWq0AltEOhy8FOz9aHHCWR0ylN psttIEEjHMr6/KG56f4okXKlxBT+uLDOp1eujdJv73AWyNLyNnhnoUX5wgJu5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668343147; 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=P6H0kj1OYZGwHhxwW9/Zx7uKu4qQM6HeJ+7cl63a9Ko=; b=c6B/XU8A2YaLNLlfcFVgNkpLVrXPKazZdD65d3djqvTUhC/K3ZrG3H+/fsicBV08uN/0BU s/gVRHrP01iKGlewY2XURHj+ey0+NqzbSnWoYJJd1XfDpWF9pOOuYruZuN8aDQUUyeXLgN UveBehVZgoWYEbSrDRidCsphNmcTWGas6xTSdgUQ5KxNXy/qCsyYcE9ZRfcaJqEL6oxBgd 9dFxPZnS/iV1sCxO0lWtxsl2K3bEoxTd8hYsvpcRZi0xIYPyLI0laC+SdOhaIlnyJjvdB8 wol4uVvvQgSMWOIMZo/dzUU1URVDLUEZQQOEwBqGXsaDYqWqs3dTJ+sE4WsXrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668343147; a=rsa-sha256; cv=none; b=l6Xktcm59LjcTiCwKyyhnMb8LAWeoplwujWYjGsgX6wMHIwDvODECRLZSTNWffY47TrH8e pYQXODrAtPCS5swUtRAKpF37QsbQljOk/aVgEK5W5mBMQF8/EymmGLa8CTYCU6MwC/DyC2 OdPjbcfofOXOIP5p+We41aHwBMhs266RpwGf+1F5cp5M48dqySOWWHIJXVS5dGFu2CvC3L OA+EMVtGzV8ZU2MNEIGivcHY9gzQDi1M4da3tGwjg0egr0DuEhuA63qlN/TbT+yvtjU3QI mLog9EU/TEACcMY7FsSV3k9UDgvreCFJUbueUT8zxcG6dXjc7Q+VDagVnCZ3cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N9Bp30MSfz1300; Sun, 13 Nov 2022 12:39:07 +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 2ADCd6q0094183; Sun, 13 Nov 2022 12:39:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ADCd6Mh094182; Sun, 13 Nov 2022 12:39:06 GMT (envelope-from git) Date: Sun, 13 Nov 2022 12:39:06 GMT Message-Id: <202211131239.2ADCd6Mh094182@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: c145b6539b6a - main - www/h2o: fix for building with LibreSSL 3.5.3 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: c145b6539b6ad55dc4894e0b9f7ff78181deb447 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=c145b6539b6ad55dc4894e0b9f7ff78181deb447 commit c145b6539b6ad55dc4894e0b9f7ff78181deb447 Author: Dave Cottlehuber AuthorDate: 2022-11-13 12:17:06 +0000 Commit: Dave Cottlehuber CommitDate: 2022-11-13 12:17:06 +0000 www/h2o: fix for building with LibreSSL 3.5.3 PR: 266659 Sponsored by: SkunkWerks, GmbH --- www/h2o/Makefile | 26 +++++++++++++----------- www/h2o/files/patch-deps_neverbleed_neverbleed.c | 13 +++++++++++- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 1f6c9939c44f..9c0aa96381bc 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,22 +1,23 @@ PORTNAME= h2o DISTVERSIONPREFIX= v DISTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= dch@FreeBSD.org COMMENT= Optimized HTTP/2 server including support for TLS 1.3 and HTTP/1.x WWW= https://github.com/h2o/h2o -LICENSE= MIT BSD2CLAUSE +LICENSE= BSD2CLAUSE MIT LICENSE_COMB= multi -BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported -BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported +BROKEN_armv6= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported +BROKEN_armv7= fails to compile: asm_arm.inc:139:36: '.syntax divided' arm assembly not supported BROKEN_FreeBSD_12_powerpc64= fails to link: unrecognized option '-Wl,-rpath=/usr/local/lib/gcc6' LIB_DEPENDS= libuv.so:devel/libuv -USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig +USES= cmake:noninja compiler:c11 cpe perl5 pkgconfig shebangfix ssl USE_GITHUB= yes USE_PERL5= run USE_LDCONFIG= yes @@ -30,13 +31,13 @@ SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md SUB_FILES= ${PORTNAME} ${PORTNAME}.conf.sample -SUB_LIST+= H2O_USER=${H2O_USER} \ - H2O_GROUP=${H2O_GROUP} \ - H2O_LOGDIR=${H2O_LOGDIR} +SUB_LIST+= H2O_GROUP=${H2O_GROUP} \ + H2O_LOGDIR=${H2O_LOGDIR} \ + H2O_USER=${H2O_USER} -PLIST_SUB= H2O_USER=${H2O_USER} \ - H2O_GROUP=${H2O_GROUP} \ - H2O_LOGDIR=${H2O_LOGDIR} +PLIST_SUB= H2O_GROUP=${H2O_GROUP} \ + H2O_LOGDIR=${H2O_LOGDIR} \ + H2O_USER=${H2O_USER} H2O_USER?= www H2O_GROUP?= www @@ -45,12 +46,13 @@ H2O_LOGDIR= /var/log/${PORTNAME}/ USE_RC_SUBR= ${PORTNAME} -OPTIONS_DEFINE= MRUBY DOCS +OPTIONS_DEFINE= DOCS MRUBY 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=ON \ + -DWITH_BUNDLED_SSL=OFF MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison diff --git a/www/h2o/files/patch-deps_neverbleed_neverbleed.c b/www/h2o/files/patch-deps_neverbleed_neverbleed.c index 2cffd570efbb..4fd3bcd79533 100644 --- a/www/h2o/files/patch-deps_neverbleed_neverbleed.c +++ b/www/h2o/files/patch-deps_neverbleed_neverbleed.c @@ -1,6 +1,17 @@ --- deps/neverbleed/neverbleed.c.orig 2019-08-12 14:09:44 UTC +++ deps/neverbleed/neverbleed.c -@@ -630,7 +630,7 @@ static int sign_stub(struct expbuf_t *buf) +@@ -45,7 +45,9 @@ + #endif + #include "neverbleed.h" + +-#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL) ++#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL \ ++ || (defined(LIBRESSL_VERSION_NUMBER) \ ++ && LIBRESSL_VERSION_NUMBER >= 0x3050300fL)) + #define OPENSSL_1_1_API 1 + #else + #define OPENSSL_1_1_API 0 +@@ -630,7 +632,7 @@ static int sign_stub(struct expbuf_t *buf) return 0; }