git: b29e56a84d27 - main - www/node18: Fix build with OpenSSL 3

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b29e56a84d27ac914faa3cab5343e492018e842f

commit b29e56a84d27ac914faa3cab5343e492018e842f
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-07 05:45:00 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
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 <netdb.h>
  #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<Value>& args) {