From nobody Tue Jun 13 06:38:58 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 4QgJmf2GQ4z4cQQY; Tue, 13 Jun 2023 06:38:58 +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 4QgJmf1m9yz3rkv; Tue, 13 Jun 2023 06:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686638338; 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=NLecff7v6IUQkYYW4oO/mG4Ky4jj/sYW/KCjf+FLbbw=; b=mLHq4UU6EOwQKW4zh4+6h15YYOgDwjyu00aG1O7w5VzKopDEIOpcuXnL1of9OTOcNZm5y8 OC0UB/S3DUo9FpXizeLRHPEyNUCJk40Qa/9bHOwTNFB3qBx5uynPFtCdmP5RXiUqb0u6Sk jd5h6D1xOwYMfZszgpWs5ofVukZf+36fjfWphJ5QLtmJEnnjJU98+T+ptR5zkJ0m/t7O9Q 4TbdI2nMyU47qQCeQITRYzDRsRi1vk+TEB+7qamXh0VuRhKdszeWrwLmBxBmYIxl7uxo3J aaz/uIuLeMMEWltznNzZVp7tCxrmmQnDft+MZevMfvRbszQR50de1Sht1T+clg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686638338; 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=NLecff7v6IUQkYYW4oO/mG4Ky4jj/sYW/KCjf+FLbbw=; b=AQdmT0bhMFvjdLQKabIuEtAleyS42GLq/NJrJ3H+CvZxRd5TXOi2hJlcdKMAnEIr5R/6OX vvZdyeseQphusDbXInW6pcmAzxhjoqF7mxyoaMza/b7N2eoqdrh4ZmkKa2Rjph58vadQgh OFqQbiQEmjfvbs9+fQqbCkFY9ZZYRjXZTeFCRE80OrI2h2viZR09ASUs6gncLNST30QS6r tOSWQCCgrP3X6w/+J7ojyiExvNQLPwyqC54YG6EFUWYXmcg8pej41WYN1iUhkoPKD8M3hH UoisftAa9Xh1zqf5LBrlwsxWqAQLK16J50YzqlOVALkhYEB8fko60d1O2ATrNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686638338; a=rsa-sha256; cv=none; b=n2+pTLxbfwm9vVWogOb+pVmKxKKJIGQV8hxnc6LY68ysUEgMQReGs+cwzl4V5VkEPELhdA E6fVOg8ibLLpf99Mm1IqTcmzbsx9ZHnLsFzBWr/U8+exMFiEPLw3piuhZdoP6yxiCjF9WX cKwT4kiKMTjYkyIy1ujmJTYfaEQaJcAvYqQvfozVWWPupcbzu57PT5DE4LKCG8RMJzb+VB B5kzjTxr9lpuoL9Wo4bqIftHt+x0uZQlkrEdHBRlOMd6MppPa6EovmtmGBZr0EkNb4ICmL 0vLMJoXqbavTQG/uAisDVDynQ7nyKco5AwTJ3/Efnt5ATsEea+bO6dWfTcV3fQ== 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 4QgJmf0qKrz1BZG; Tue, 13 Jun 2023 06:38:58 +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 35D6cwqt047486; Tue, 13 Jun 2023 06:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35D6cwRx047485; Tue, 13 Jun 2023 06:38:58 GMT (envelope-from git) Date: Tue, 13 Jun 2023 06:38:58 GMT Message-Id: <202306130638.35D6cwRx047485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: c2664553adba - main - www/node16: Fix build with OpenSSL 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2664553adba708d98bffc275a651955d73edf1c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2664553adba708d98bffc275a651955d73edf1c commit c2664553adba708d98bffc275a651955d73edf1c Author: Juraj Lutter AuthorDate: 2023-06-12 06:54:34 +0000 Commit: Juraj Lutter CommitDate: 2023-06-13 06:38:20 +0000 www/node16: Fix build with OpenSSL 3 - This was tested only with OpenSSL 3 from base but not with openssl30 or openssl31 ports. - Regen patches PR: 271656 --- ...eps_openssl_config_archs_linux-elf_no-asm_openssl.gypi | 4 ++-- .../files/patch-deps_openssl_openssl-cl__no__asm.gypi | 6 +++--- www/node16/files/patch-deps_openssl_openssl__no__asm.gypi | 6 +++--- www/node16/files/patch-node.gypi | 4 ++-- www/node16/files/patch-src_crypto_crypto__util.cc | 15 +++++++++++++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/www/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi b/www/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi index 1da46abc11ad..aad8ab036c0b 100644 --- a/www/node16/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi +++ b/www/node16/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-03-17 20:16:25 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-03-28 21:14:18 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -698,7 +698,7 @@ +@@ -699,7 +699,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ diff --git a/www/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi b/www/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi index 8966d6b4ba0d..3aa5573e17ef 100644 --- a/www/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi +++ b/www/node16/files/patch-deps_openssl_openssl-cl__no__asm.gypi @@ -1,4 +1,4 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2020-09-08 12:17:10 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-03-28 21:14:18 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { @@ -6,8 +6,8 @@ 'conditions': [ ['target_arch=="ppc" and OS=="aix"', { 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], -@@ -47,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl-cl.gypi'], +@@ -49,7 +50,7 @@ + 'includes': ['config/archs/linux64-riscv64/no-asm/openssl-cl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], diff --git a/www/node16/files/patch-deps_openssl_openssl__no__asm.gypi b/www/node16/files/patch-deps_openssl_openssl__no__asm.gypi index 1fef0c4ca71f..fbce5b5affea 100644 --- a/www/node16/files/patch-deps_openssl_openssl__no__asm.gypi +++ b/www/node16/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-03-28 21:14:18 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -48,7 +48,7 @@ - 'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'], +@@ -50,7 +50,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/node16/files/patch-node.gypi b/www/node16/files/patch-node.gypi index ff86f35a170b..9b726fefe1f4 100644 --- a/www/node16/files/patch-node.gypi +++ b/www/node16/files/patch-node.gypi @@ -1,6 +1,6 @@ ---- node.gypi.orig 2021-03-03 05:40:19 UTC +--- node.gypi.orig 2023-03-28 21:14:21 UTC +++ node.gypi -@@ -319,6 +319,9 @@ +@@ -338,6 +338,9 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ diff --git a/www/node16/files/patch-src_crypto_crypto__util.cc b/www/node16/files/patch-src_crypto_crypto__util.cc new file mode 100644 index 000000000000..e31cabd10570 --- /dev/null +++ b/www/node16/files/patch-src_crypto_crypto__util.cc @@ -0,0 +1,15 @@ +--- src/crypto/crypto_util.cc.orig 2023-06-12 06:44:17 UTC ++++ src/crypto/crypto_util.cc +@@ -194,10 +194,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 // OPENSSL_VERSION_MAJOR < 3 + + NodeBIO::GetMethod(); + }