From nobody Tue Aug 08 09:55:30 2023 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 4RKpTZ3qrYz4m5s5; Tue, 8 Aug 2023 09:55:30 +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 4RKpTZ1QHzz4THh; Tue, 8 Aug 2023 09:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691488530; 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=Wro/C1NTVTteLDy1CLUSGoSTsNTPpr5HVPtIO3tV15U=; b=MGV1jc3ZBPaORrEBLKrvBxOraeRZyc93o6nPfDWqNx1mTccZvI0nTwca2xoI2LlWAacSD2 cZ17J5UHR9ovAy8Vc44V0LTwD6T1UXWYTN7BBxPM9oNt2MuAFZQcJ9FuvgjmpNbh9cmSsY qNrNzVuXH+vSA3/0bt3GEs/va35vKUWFwC4dUe8yUpt1kcEY6bip5NljryWDJnXGH2rV5p lFV0ffFbEfFGjTRiXDZKVykLoGWvzN9sM0ItB4y1TZJ+8omwsx560z4/meNdKA14UCpHJc IciCmHdQSTuCirEYvfcDc3BEWGjB/2NTyT32gK9Nf2VCjoEgdRS6yX25aNrfag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691488530; 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=Wro/C1NTVTteLDy1CLUSGoSTsNTPpr5HVPtIO3tV15U=; b=Sr5piSwpI8HD6UD5YQ3+nCHMFIsJaO2cRRjIGv1L10NejantCpX74WTybYOKWOHH7J9hwz GPtUsBGkJYLE/EU+56b2hKTiYH0Mza9CNRMdAJZnzq45bzSr1jAKK8ueSzhqc4vmnjGOGR uy3JX7dCR3ibQQ4OO4z+WN0pJtUAySiD/CO1UAf1pzZ/Mj487EQnGDd4jDyiy6G1C19rnf oae5FMrBjrihnfD/l+zhe0T6czhtr6/W2Mf/Yy3bN5qkGGKUL89Ly94gY3mP28MJ6u74Tg XmuFJ+oUzZHGtZCGQG1Se2w/VKekA6EcGSlw7KebhIoWzJFa5fU+Rr7XYaWMTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691488530; a=rsa-sha256; cv=none; b=NHLC3ird2wAO4Hnt6ci44ZYgJt8Rn5oYI3FevlYF6WB416CYN+imOWX8XwwHfPJSpWU51Y pfHTY5szEI6MG+awIgqzUZS3FbPbFJ0BIrOa31skw3KxiE18LVu+TRfOQJ6q3LjFypo5xh bYkk99ws49rZ6bsZn+cDOPOmmYdHisHhdy7pvkHLK5CXxZF+HE6AUoCw/gSFaxYXTMxMmQ 6CZAOk4xM0FPPlgrThZRDYqDiNk/YFMiyzUZvbDGH6HsJF8W3q5//EPiNfQw2HzKb9R7Wk l4p+Ea94QiiZhjMEIcS16+jjD0tnDA3F4wsMQ7QJ9mNEDmQxrOciMrpsnXniqQ== 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 4RKpTZ0XNMzVLT; Tue, 8 Aug 2023 09:55:30 +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 3789tUP3075362; Tue, 8 Aug 2023 09:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3789tUhY075361; Tue, 8 Aug 2023 09:55:30 GMT (envelope-from git) Date: Tue, 8 Aug 2023 09:55:30 GMT Message-Id: <202308080955.3789tUhY075361@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: f9432f4e7b2c - main - www/h2o-devel: Fix build with openssl3 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9432f4e7b2c2331ef90c02c14673ddf343bc1fd Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9432f4e7b2c2331ef90c02c14673ddf343bc1fd commit f9432f4e7b2c2331ef90c02c14673ddf343bc1fd Author: Muhammad Moinur Rahman AuthorDate: 2023-08-08 09:50:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-08 09:55:14 +0000 www/h2o-devel: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- www/h2o-devel/files/patch-src_ssl.c | 12 ++++++++++++ www/h2o-devel/pkg-plist | 1 + 2 files changed, 13 insertions(+) diff --git a/www/h2o-devel/files/patch-src_ssl.c b/www/h2o-devel/files/patch-src_ssl.c new file mode 100644 index 000000000000..938c96e1e7ee --- /dev/null +++ b/www/h2o-devel/files/patch-src_ssl.c @@ -0,0 +1,12 @@ +--- src/ssl.c.orig 2023-08-08 09:33:37 UTC ++++ src/ssl.c +@@ -1182,7 +1182,9 @@ void init_openssl(void) + SSL_library_init(); + OpenSSL_add_all_algorithms(); + #if H2O_CAN_OSSL_ASYNC ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_ASYNC_strings(); ++#endif + #endif + + /* When using OpenSSL >= 3.0, load legacy provider so that blowfish can be used for 64-bit QUIC CIDs. */ diff --git a/www/h2o-devel/pkg-plist b/www/h2o-devel/pkg-plist index af36fdd94a89..212866fc94ad 100644 --- a/www/h2o-devel/pkg-plist +++ b/www/h2o-devel/pkg-plist @@ -89,6 +89,7 @@ share/man/man8/h2o.8.gz %%PORTDOCS%%%%DOCSDIR%%/examples/doc_root/index.html %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/alternate.key +%%PORTDOCS%%%%DOCSDIR%%/examples/h2o/ech.key %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/h2o.conf %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.crt %%PORTDOCS%%%%DOCSDIR%%/examples/h2o/server.key