mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-19 00:13:33 +00:00
www/node20: 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:
parent
b29e56a84d
commit
6370a26a67
@ -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-05-16 06:58:19 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': [
|
||||
|
@ -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-05-16 06:58:20 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'],
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- deps/v8/src/libsampler/sampler.cc.orig 2021-10-19 00:48:30 UTC
|
||||
--- deps/v8/src/libsampler/sampler.cc.orig 2023-05-16 06:58:20 UTC
|
||||
+++ deps/v8/src/libsampler/sampler.cc
|
||||
@@ -497,6 +497,10 @@ void SignalHandler::FillRegisterState(void* context, R
|
||||
@@ -511,6 +511,10 @@ void SignalHandler::FillRegisterState(void* context, R
|
||||
state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
|
||||
state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
|
||||
state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- node.gypi.orig 2021-10-19 00:48:32 UTC
|
||||
--- node.gypi.orig 2023-05-16 06:58:21 UTC
|
||||
+++ node.gypi
|
||||
@@ -319,6 +319,9 @@
|
||||
@@ -349,6 +349,9 @@
|
||||
[ 'node_use_openssl=="true"', {
|
||||
'defines': [ 'HAVE_OPENSSL=1' ],
|
||||
'conditions': [
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- src/cares_wrap.h.orig 2021-08-18 22:13:12 UTC
|
||||
--- src/cares_wrap.h.orig 2023-05-16 06:58:21 UTC
|
||||
+++ src/cares_wrap.h
|
||||
@@ -22,7 +22,7 @@
|
||||
@@ -23,7 +23,7 @@
|
||||
# include <netdb.h>
|
||||
#endif // __POSIX__
|
||||
|
||||
|
15
www/node20/files/patch-src_crypto_crypto__util.cc
Normal file
15
www/node20/files/patch-src_crypto_crypto__util.cc
Normal file
@ -0,0 +1,15 @@
|
||||
--- src/crypto/crypto_util.cc.orig 2023-06-06 21:54:38 UTC
|
||||
+++ src/crypto/crypto_util.cc
|
||||
@@ -205,10 +205,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) {
|
@ -1,6 +1,6 @@
|
||||
--- tools/v8_gypfiles/v8.gyp.orig 2022-11-14 02:26:08 UTC
|
||||
--- tools/v8_gypfiles/v8.gyp.orig 2023-05-16 06:58:22 UTC
|
||||
+++ tools/v8_gypfiles/v8.gyp
|
||||
@@ -975,7 +975,7 @@
|
||||
@@ -1091,7 +1091,7 @@
|
||||
}],
|
||||
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
|
||||
# to implement atomic memory access
|
||||
|
Loading…
Reference in New Issue
Block a user