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)
This commit is contained in:
Muhammad Moinur Rahman 2023-06-07 07:45:00 +02:00
parent fada8f3ec8
commit b29e56a84d
5 changed files with 24 additions and 9 deletions

View file

@ -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': [

View file

@ -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'],

View file

@ -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': [

View file

@ -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__

View file

@ -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) {