From nobody Wed Jun 7 07:25:20 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 4Qbf4w5Z5wz4ZpBG; Wed, 7 Jun 2023 07:25:20 +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 4Qbf4w292qz3GWN; Wed, 7 Jun 2023 07:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686122720; 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=i9Qviwt2WCZ7tcOHTI8euVxm1mAlGJ67daJgRUVR04k=; b=iPdKlp4yD5QmCXVxNEGl2Ya0pz80N3WAv6o0BuTa12YiOMrlrYxkd9oUDFZukpB6TAC4Jl ZpJA9tLt6em0zfGKipQakSX7zs+HCXrGZB0DFcLQjryFtbIdWtx/e7EffAiRawt9SfrY5p rBjM5mCwF50pxabW3yTngWpODf7w3rOXmCO2U1pc89aBCE2r3qZzm1+n9wB7wWIsGSo1Qo /vbI7ufAcU9muFfSlzwicC278+uX/sqK5zHyHav7KWyzKt2zZ9yvQpPEqywkf82eDWhm1o ylnx9afORXPuEG1JUrfoNjHB4YpS1MmwGAQ5L/uwMiREcBGHTnPFiNRZ3Jb2MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686122720; 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=i9Qviwt2WCZ7tcOHTI8euVxm1mAlGJ67daJgRUVR04k=; b=PREXzcANtNdhXqbFe5b+ZEiPv7i+x9X9lokwqKRHPK3pRfyv9GfsrKnv8Ckh2f4kC2ftW/ /Lp5bgqof5MDdAU3g1N/p+TVvkAqZ0zGfP5XR6pbvqAAjjplhaG3K00NjaB/BrUhd7beHD av5VFtqXuEysSmeqp3tBHcr7F2xV846Z0gpyScdXm8pzSG5QPAreJ64LWDfNHw9oSKEVcL 2fKn/U4Hfw8AfEtntzLwdLG2VDQHAWwGoyGN4BFN4cW6inPhYUea3gGmjQ0RrLluPMFBJD 3eGExTC+Egwxu5Kd2OyfN98qPhLh84JGqrrr9VkxmzcuUwSstgwZPdfoDE9SCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686122720; a=rsa-sha256; cv=none; b=Xc38jrk8JlTkuDj0JOgLo4yahm+UtShO35q5Q2C63GQHu5ViEJ3qR71DeK+ENel35OU9ek BSeOoASkb+GNMpKPbdoEafnmGWxrKg+D5zQ3FpS1nc0NHW9rlFShN6t3tWsWOmThNkYb3R VtqvyjiLiIwrb32IAErnozbpSqS48BEPSkB3eAUyDRNZ7zhwZBjmyi17kJhjh/QaX6nwOv zD15ckfhaDFz68vOrwr4EfAmQMSf9pSGKp7SGdfRLJUDVgT5zy/FyBSQvZ30dE40AbvBrA chfhZoF4jtpvMwhXsDXoTaucK13vDySob9Jk9AZZIuHfnch28wx1GeS75R4GBw== 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 4Qbf4w1Dk4z130B; Wed, 7 Jun 2023 07:25:20 +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 3577PKG8084970; Wed, 7 Jun 2023 07:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3577PKOs084969; Wed, 7 Jun 2023 07:25:20 GMT (envelope-from git) Date: Wed, 7 Jun 2023 07:25:20 GMT Message-Id: <202306070725.3577PKOs084969@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: b29e56a84d27 - main - www/node18: Fix build with OpenSSL 3 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: b29e56a84d27ac914faa3cab5343e492018e842f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b29e56a84d27ac914faa3cab5343e492018e842f commit b29e56a84d27ac914faa3cab5343e492018e842f Author: Muhammad Moinur Rahman AuthorDate: 2023-06-07 05:45:00 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-07 07:25:08 +0000 www/node18: Fix build with OpenSSL 3 - This was tested only with OpenSSL 3 from base but not with openssl30 or openssl31 ports - Refresh patches PR: 271868 Reported by: emaste Approved by: portmgr (blanket) --- ...eps_openssl_config_archs_linux-elf_no-asm_openssl.gypi | 4 ++-- www/node18/files/patch-deps_openssl_openssl__no__asm.gypi | 6 +++--- www/node18/files/patch-node.gypi | 4 ++-- www/node18/files/patch-src_cares__wrap.h | 4 ++-- www/node18/files/patch-src_crypto_crypto__util.cc | 15 +++++++++++++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi b/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi index 271bebf2f6b0..43f4e2a7dcaa 100644 --- a/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi +++ b/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi @@ -1,6 +1,6 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2021-10-19 00:48:28 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -980,7 +980,7 @@ +@@ -977,7 +977,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ diff --git a/www/node18/files/patch-deps_openssl_openssl__no__asm.gypi b/www/node18/files/patch-deps_openssl_openssl__no__asm.gypi index 1fef0c4ca71f..aa336fd927fa 100644 --- a/www/node18/files/patch-deps_openssl_openssl__no__asm.gypi +++ b/www/node18/files/patch-deps_openssl_openssl__no__asm.gypi @@ -1,7 +1,7 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2020-09-08 12:17:11 UTC +--- deps/openssl/openssl_no_asm.gypi.orig 2023-04-12 04:09:14 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -48,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'], +@@ -44,7 +44,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], diff --git a/www/node18/files/patch-node.gypi b/www/node18/files/patch-node.gypi index f48b5b1091cb..d76ca9efd2f4 100644 --- a/www/node18/files/patch-node.gypi +++ b/www/node18/files/patch-node.gypi @@ -1,6 +1,6 @@ ---- node.gypi.orig 2021-10-19 00:48:32 UTC +--- node.gypi.orig 2023-04-12 04:09:19 UTC +++ node.gypi -@@ -319,6 +319,9 @@ +@@ -349,6 +349,9 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ diff --git a/www/node18/files/patch-src_cares__wrap.h b/www/node18/files/patch-src_cares__wrap.h index 7f57f6d8b333..ab73ea7d2c4e 100644 --- a/www/node18/files/patch-src_cares__wrap.h +++ b/www/node18/files/patch-src_cares__wrap.h @@ -1,6 +1,6 @@ ---- src/cares_wrap.h.orig 2021-08-18 22:13:12 UTC +--- src/cares_wrap.h.orig 2023-04-12 04:09:19 UTC +++ src/cares_wrap.h -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ # include #endif // __POSIX__ diff --git a/www/node18/files/patch-src_crypto_crypto__util.cc b/www/node18/files/patch-src_crypto_crypto__util.cc new file mode 100644 index 000000000000..cc25a8114d05 --- /dev/null +++ b/www/node18/files/patch-src_crypto_crypto__util.cc @@ -0,0 +1,15 @@ +--- src/crypto/crypto_util.cc.orig 2023-06-06 21:00:49 UTC ++++ src/crypto/crypto_util.cc +@@ -195,10 +195,12 @@ void InitCryptoOnce() { + // No-op with OPENSSL_NO_COMP builds of OpenSSL. + sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); + ++#if OPENSSL_VERSION_MAJOR < 3 + #ifndef OPENSSL_NO_ENGINE + ERR_load_ENGINE_strings(); + ENGINE_load_builtin_engines(); + #endif // !OPENSSL_NO_ENGINE ++#endif + } + + void GetFipsCrypto(const FunctionCallbackInfo& args) {