From nobody Mon Aug 07 23:40:35 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 4RKXr42Lwkz4pm2T; Mon, 7 Aug 2023 23:40:36 +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 4RKXr41sRSz4X8Z; Mon, 7 Aug 2023 23:40:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451636; 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=G570ojSh11HPyczRzzanrDuv+g7ExNIQD66SHSqdlqE=; b=f9oKEFi823/o71x1SGYXGRfI+aN4gZgKHAn1V1p9sAgLpcUS5UI5ClcYIorjijOGnHxLCU 6hKifEM6dGaoV+zgqdvc7WoyRyxPESDp5fQY5pHZWgH3PC3nZbPiF0lkLA3HYbkcKnsB2C 4QfY5WD0L2aNSDCc7jqzrQz9F7R/ObR7sJiunooALzhgRa3xiAa5YuFr3CBKUZW+cG3ZS+ FaHTHct5gheWJBeaux1is46sS1UqTbdeBkaqDXn/IdwclwDDKGgYz3Cqa8Bw1luN6WrBJm iV0y8cq8SPwIr2RtVkzoslfydC2JT6AqRcM7LAMxvdJvg83N9umK4lIOdYMl2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691451636; 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=G570ojSh11HPyczRzzanrDuv+g7ExNIQD66SHSqdlqE=; b=kvixedA5yoxlgzgrDeUtNjKFsjINBxpTiJHLs8OUJ6jv2rBav4ZqtpBo2eTiTf10U30L8W weB70r02rkW43vSnN+Rcg8g06QTo9rJGxqVbSmync7SaOMNQQ36eF7CTEjM/m8Hun5z8yH 3flIojZI73UOxU/lZ1DuPWay8wBh0bz4Vp7qOFT2/xI8z3Fh20sUwlnnbtPk6E1YDvqx5b Rn3cMlr4aLcQoEZw2IX+PEUfgxL+md6cqdPXMEGjGRUfCvnRP2VZ/tc67Jh2qvYTIdTe+S nqof2QAAFOBc80ySTs3VnWmwJxFIMLfAH8dSp2qfifbXprhGO9/Xe/+UHzZBcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691451636; a=rsa-sha256; cv=none; b=hhYmu3nzTVW0unzMsXw7I6eskVt2b0Q1lrrDCXUfJLHxxRkjKGZymgB6/HfxSx+jqfZpOt G4fCwuYyXjEHnOkCB0ZCsLhrl1VzoghB8zBRQXAyX3EhvNja0mooUbeXkKP1Yl4b+/OC3F b8eD8elZMvWDdooJlm+C06MsF7dLn10qU+eb8Tmv7xn4FwTnvoLMa+D8T1SPUyXns9GRGS YkfViKIPX3Qk9qsAG8bcIkmCVjY0L52F95aFSoekQSDqsgva7Xw6z99r7q1kcHqhEzRRL8 zLdTOIzFgIGeomU3tvHKJSqgjfvnmVEZaAtOKNufhk0zCcE1Vyq0LCF2clE7iA== 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 4RKXr40h9Kz1B7x; Mon, 7 Aug 2023 23:40:36 +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 377NeaQi052128; Mon, 7 Aug 2023 23:40:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377NeZue052127; Mon, 7 Aug 2023 23:40:35 GMT (envelope-from git) Date: Mon, 7 Aug 2023 23:40:35 GMT Message-Id: <202308072340.377NeZue052127@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: c0cc6dc80c47 - main - www/lagrange: 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: c0cc6dc80c47d64dd9211daa1e59a4a78f8400f3 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0cc6dc80c47d64dd9211daa1e59a4a78f8400f3 commit c0cc6dc80c47d64dd9211daa1e59a4a78f8400f3 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-07 17:29:55 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-07 22:00:18 +0000 www/lagrange: Fix build with openssl3 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- www/lagrange/Makefile | 8 +----- .../patch-lib_the__Foundation_src_tlsrequest.c | 33 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/www/lagrange/Makefile b/www/lagrange/Makefile index 833942da2481..73dddd1179e1 100644 --- a/www/lagrange/Makefile +++ b/www/lagrange/Makefile @@ -31,10 +31,4 @@ OPTIONS_DEFINE= SSE41 SSE41_DESC= Enable SSE4.1 support SSE41_CMAKE_ON= -DTFDN_ENABLE_SSE41:BOOL=ON -.include - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x30000000L -.endif - -.include +.include diff --git a/www/lagrange/files/patch-lib_the__Foundation_src_tlsrequest.c b/www/lagrange/files/patch-lib_the__Foundation_src_tlsrequest.c new file mode 100644 index 000000000000..4a9b32d99641 --- /dev/null +++ b/www/lagrange/files/patch-lib_the__Foundation_src_tlsrequest.c @@ -0,0 +1,33 @@ +--- lib/the_Foundation/src/tlsrequest.c.orig 2023-08-07 17:23:22 UTC ++++ lib/the_Foundation/src/tlsrequest.c +@@ -72,9 +72,9 @@ static iBool readAllFromBIO_(BIO *bio, iBlock *out) { + /*----------------------------------------------------------------------------------------------*/ + + iDeclareClass(CachedSession) +- ++ + static const int maxSessionAge_CachedSession_ = 10 * 60; /* seconds */ +- ++ + struct Impl_CachedSession { + iObject object; + iBlock pemSession; +@@ -249,7 +249,9 @@ void init_Context(iContext *d) { + SSL_load_error_strings(); + ERR_load_crypto_strings(); + #endif ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_BIO_strings(); ++#endif + d->ctx = SSL_CTX_new(TLS_client_method()); + if (!d->ctx) { + iDebug("[TlsRequest] failed to initialize OpenSSL\n"); +@@ -1012,7 +1014,7 @@ static iBool readIncoming_TlsRequest_(iTlsRequest *d) + + static iThreadResult run_TlsRequest_(iThread *thread) { + iTlsRequest *d = userData_Thread(thread); +- /* Thread-local pointer to the current request so it can be accessed in the ++ /* Thread-local pointer to the current request so it can be accessed in the + verify callback. */ + iDebug("[TlsRequest] run_TlsRequest_: %zu bytes to send\n", size_Block(&d->sending)); + setCurrentRequestForThread_Context_(context_, d);