Index: common.gypi --- common.gypi.orig 2024-07-24 10:17:57.000000000 +0200 +++ common.gypi 2024-07-27 00:59:04.923266000 +0200 @@ -189,7 +189,7 @@ }], ], }, - 'cflags': [ '-O3' ], + 'cflags': [ '-O2' ], 'conditions': [ ['enable_lto=="true"', { 'cflags': ['<(lto)'], @@ -462,7 +462,7 @@ 'ldflags': [ '-pthread' ], }], [ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', { - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], + 'cflags': [ '-Wno-unused-parameter', ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ], 'defines': [ '__STDC_FORMAT_MACROS' ], 'ldflags': [ '-rdynamic' ], @@ -598,10 +598,7 @@ '-fno-strict-aliasing', ], 'WARNING_CFLAGS': [ - '-Wall', - '-Wendif-labels', - '-W', - '-Wno-unused-parameter', + '-Wno-unused-parameter' ], }, 'target_conditions': [ Index: deps/uv/common.gypi --- deps/uv/common.gypi.orig 2024-07-24 10:17:58.000000000 +0200 +++ deps/uv/common.gypi 2024-07-27 00:59:04.923372000 +0200 @@ -46,7 +46,7 @@ 'Release': { 'defines': [ 'NDEBUG' ], 'cflags': [ - '-O3', + '-O2', ], 'msvs_settings': { 'VCCLCompilerTool': { Index: deps/uv/uv.gyp --- deps/uv/uv.gyp.orig 2024-07-24 10:17:58.000000000 +0200 +++ deps/uv/uv.gyp 2024-07-27 00:59:04.923471000 +0200 @@ -219,7 +219,7 @@ '<@(uv_sources_posix)', ], 'link_settings': { - 'libraries': [ '-lm' ], + 'libraries': [ '-lz', '-lm' ], 'conditions': [ ['OS=="solaris"', { 'ldflags': [ '-pthreads' ], Index: deps/v8/src/base/numbers/bignum.cc --- deps/v8/src/base/numbers/bignum.cc.orig 2024-07-24 10:17:58.000000000 +0200 +++ deps/v8/src/base/numbers/bignum.cc 2024-07-27 00:59:04.923604000 +0200 @@ -5,6 +5,7 @@ #include "src/base/numbers/bignum.h" #include "src/base/strings.h" +#include namespace v8 { namespace base { Index: deps/v8/src/base/platform/platform-freebsd.cc --- deps/v8/src/base/platform/platform-freebsd.cc.orig 2024-07-24 10:17:58.000000000 +0200 +++ deps/v8/src/base/platform/platform-freebsd.cc 2024-07-27 00:59:04.923681000 +0200 @@ -28,6 +28,7 @@ #include // index #include +#include #undef MAP_TYPE Index: deps/v8/src/base/strings.h --- deps/v8/src/base/strings.h.orig 2024-07-24 10:17:58.000000000 +0200 +++ deps/v8/src/base/strings.h 2024-07-27 00:59:04.923746000 +0200 @@ -8,6 +8,7 @@ #include "src/base/base-export.h" #include "src/base/macros.h" #include "src/base/vector.h" +#include namespace v8 { namespace base { Index: deps/v8/src/wasm/wasm-result.cc --- deps/v8/src/wasm/wasm-result.cc.orig 2024-07-24 10:17:59.000000000 +0200 +++ deps/v8/src/wasm/wasm-result.cc 2024-07-27 00:59:04.923834000 +0200 @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include + #include "src/wasm/wasm-result.h" #include "src/base/strings.h" Index: lib/dns.js --- lib/dns.js.orig 2024-07-24 10:18:00.000000000 +0200 +++ lib/dns.js 2024-07-27 00:59:04.923930000 +0200 @@ -232,6 +232,10 @@ order = DNS_ORDER_IPV6_FIRST; } + /* FreeBSD getaddrinfo(3) knows AI_V4MAPPED, but dislikes it */ + if (process.platform === "freebsd") + hints &= ~(exports.V4MAPPED); + const err = cares.getaddrinfo( req, hostname, family, hints, order, ); Index: lib/internal/modules/cjs/loader.js --- lib/internal/modules/cjs/loader.js.orig 2024-07-24 10:18:00.000000000 +0200 +++ lib/internal/modules/cjs/loader.js 2024-07-27 00:59:04.924124000 +0200 @@ -1518,7 +1518,10 @@ path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); - const paths = [path.resolve(prefixDir, 'lib', 'node')]; + const paths = [ + path.resolve(prefixDir, '..', 'lib', 'node', 'usr'), + path.resolve(prefixDir, '..', 'lib', 'node', 'pkg') + ]; if (homeDir) { ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); Index: src/crypto/crypto_aes.cc --- src/crypto/crypto_aes.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_aes.cc 2024-07-27 00:59:04.924230000 +0200 @@ -9,8 +9,8 @@ #include "threadpoolwork-inl.h" #include "v8.h" -#include -#include +#include "openssl/bn.h" +#include "openssl/aes.h" #include Index: src/crypto/crypto_bio.cc --- src/crypto/crypto_bio.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_bio.cc 2024-07-27 00:59:04.924326000 +0200 @@ -24,7 +24,7 @@ #include "memory_tracker-inl.h" #include "util-inl.h" -#include +#include "openssl/bio.h" #include #include Index: src/crypto/crypto_common.cc --- src/crypto/crypto_common.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_common.cc 2024-07-27 00:59:04.924485000 +0200 @@ -9,14 +9,14 @@ #include "string_bytes.h" #include "v8.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "openssl/ec.h" +#include "openssl/ecdh.h" +#include "openssl/evp.h" +#include "openssl/pem.h" +#include "openssl/x509v3.h" +#include "openssl/hmac.h" +#include "openssl/rand.h" +#include "openssl/pkcs12.h" #include #include Index: src/crypto/crypto_common.h --- src/crypto/crypto_common.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_common.h 2024-07-27 00:59:04.924551000 +0200 @@ -5,8 +5,8 @@ #include "node_crypto.h" #include "v8.h" -#include -#include +#include "openssl/ssl.h" +#include "openssl/x509v3.h" #include Index: src/crypto/crypto_context.cc --- src/crypto/crypto_context.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_context.cc 2024-07-27 00:59:04.924702000 +0200 @@ -11,11 +11,11 @@ #include "util.h" #include "v8.h" -#include -#include -#include +#include "openssl/x509.h" +#include "openssl/pkcs12.h" +#include "openssl/rand.h" #ifndef OPENSSL_NO_ENGINE -#include +#include "openssl/engine.h" #endif // !OPENSSL_NO_ENGINE namespace node { Index: src/crypto/crypto_dsa.cc --- src/crypto/crypto_dsa.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_dsa.cc 2024-07-27 00:59:04.924776000 +0200 @@ -7,8 +7,8 @@ #include "threadpoolwork-inl.h" #include "v8.h" -#include -#include +#include "openssl/bn.h" +#include "openssl/dsa.h" #include Index: src/crypto/crypto_keys.h --- src/crypto/crypto_keys.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_keys.h 2024-07-27 00:59:04.924858000 +0200 @@ -11,7 +11,7 @@ #include "node_worker.h" #include "v8.h" -#include +#include "openssl/evp.h" #include #include Index: src/crypto/crypto_rsa.cc --- src/crypto/crypto_rsa.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_rsa.cc 2024-07-27 00:59:04.924948000 +0200 @@ -9,8 +9,8 @@ #include "threadpoolwork-inl.h" #include "v8.h" -#include -#include +#include "openssl/bn.h" +#include "openssl/rsa.h" namespace node { Index: src/crypto/crypto_spkac.h --- src/crypto/crypto_spkac.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_spkac.h 2024-07-27 00:59:04.924999000 +0200 @@ -6,7 +6,7 @@ #include "env.h" #include "v8.h" -#include +#include "openssl/evp.h" namespace node { namespace crypto { Index: src/crypto/crypto_timing.cc --- src/crypto/crypto_timing.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_timing.cc 2024-07-27 00:59:04.925057000 +0200 @@ -5,7 +5,7 @@ #include "v8.h" #include "node.h" -#include +#include "openssl/crypto.h" namespace node { Index: src/crypto/crypto_tls.h --- src/crypto/crypto_tls.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_tls.h 2024-07-27 00:59:04.925132000 +0200 @@ -31,7 +31,7 @@ #include "stream_wrap.h" #include "v8.h" -#include +#include "openssl/ssl.h" #include #include Index: src/crypto/crypto_util.h --- src/crypto/crypto_util.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/crypto/crypto_util.h 2024-07-27 00:59:04.925234000 +0200 @@ -12,21 +12,21 @@ #include "util.h" #include "v8.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include "openssl/dsa.h" +#include "openssl/ec.h" +#include "openssl/err.h" +#include "openssl/evp.h" +#include "openssl/hmac.h" +#include "openssl/kdf.h" +#include "openssl/rsa.h" +#include "openssl/ssl.h" #ifndef OPENSSL_NO_ENGINE -# include +# include "openssl/engine.h" #endif // !OPENSSL_NO_ENGINE // The FIPS-related functions are only available // when the OpenSSL itself was compiled with FIPS support. #if defined(OPENSSL_FIPS) && OPENSSL_VERSION_MAJOR < 3 -# include +# include "openssl/fips.h" #endif // OPENSSL_FIPS #include Index: src/inspector_socket_server.cc --- src/inspector_socket_server.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/inspector_socket_server.cc 2024-07-27 00:59:04.925332000 +0200 @@ -20,7 +20,7 @@ bool include_protocol); namespace { -static const uint8_t PROTOCOL_JSON[] = { +static uint8_t PROTOCOL_JSON[] = { #include "v8_inspector_protocol_json.h" // NOLINT(build/include_order) }; Index: src/node_constants.cc --- src/node_constants.cc.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/node_constants.cc 2024-07-27 00:59:04.925449000 +0200 @@ -36,10 +36,10 @@ #if HAVE_OPENSSL -#include -#include +#include "openssl/ec.h" +#include "openssl/ssl.h" #ifndef OPENSSL_NO_ENGINE -#include +#include "openssl/engine.h" #endif // !OPENSSL_NO_ENGINE #endif // HAVE_OPENSSL Index: src/node_metadata.cc --- src/node_metadata.cc.orig 2024-07-27 00:59:04.925541000 +0200 +++ src/node_metadata.cc 2024-07-27 09:35:48.952462000 +0200 @@ -22,15 +22,15 @@ #endif // NODE_BUNDLED_ZLIB #if HAVE_OPENSSL -#include +#include "openssl/crypto.h" #if NODE_OPENSSL_HAS_QUIC -#include +#include "openssl/quic.h" #endif #endif // HAVE_OPENSSL #ifdef OPENSSL_INFO_QUIC -#include -#include +#include "ngtcp2/version.h" +#include "nghttp3/version.h" #endif #ifdef NODE_HAVE_I18N_SUPPORT Index: src/util.h --- src/util.h.orig 2024-07-24 10:18:00.000000000 +0200 +++ src/util.h 2024-07-27 00:59:04.925759000 +0200 @@ -179,14 +179,23 @@ } \ } while (0) +#undef CHECK_EQ #define CHECK_EQ(a, b) CHECK((a) == (b)) +#undef CHECK_GE #define CHECK_GE(a, b) CHECK((a) >= (b)) +#undef CHECK_GT #define CHECK_GT(a, b) CHECK((a) > (b)) +#undef CHECK_LE #define CHECK_LE(a, b) CHECK((a) <= (b)) +#undef CHECK_LT #define CHECK_LT(a, b) CHECK((a) < (b)) +#undef CHECK_NE #define CHECK_NE(a, b) CHECK((a) != (b)) +#undef CHECK_NULL #define CHECK_NULL(val) CHECK((val) == nullptr) +#undef CHECK_NOT_NULL #define CHECK_NOT_NULL(val) CHECK((val) != nullptr) +#undef CHECK_IMPLIES #define CHECK_IMPLIES(a, b) CHECK(!(a) || (b)) #ifdef DEBUG @@ -214,6 +223,7 @@ #endif +#undef UNREACHABLE #define UNREACHABLE(...) \ ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__) Index: tools/install.py --- tools/install.py.orig 2024-07-24 10:18:01.000000000 +0200 +++ tools/install.py 2024-07-27 00:59:04.925864000 +0200 @@ -182,10 +182,7 @@ action(options, [os.path.join(options.v8_dir, 'tools/gdbinit')], 'share/doc/node/') action(options, [os.path.join(options.v8_dir, 'tools/lldb_commands.py')], 'share/doc/node/') - if 'openbsd' in sys.platform: - action(options, ['doc/node.1'], 'man/man1/') - else: - action(options, ['doc/node.1'], 'share/man/man1/') + action(options, ['doc/node.1'], 'man/man1/') if 'true' == options.variables.get('node_install_npm'): npm_files(options, action) Index: tools/v8_gypfiles/toolchain.gypi --- tools/v8_gypfiles/toolchain.gypi.orig 2024-07-24 10:18:01.000000000 +0200 +++ tools/v8_gypfiles/toolchain.gypi 2024-07-27 00:59:04.925999000 +0200 @@ -665,12 +665,6 @@ ['OS=="solaris"', { 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. }], - ['OS=="freebsd" or OS=="openbsd"', { - 'cflags': [ '-I/usr/local/include' ], - }], - ['OS=="netbsd"', { - 'cflags': [ '-I/usr/pkg/include' ], - }], ['OS=="aix" or OS=="os400"', { 'defines': [ # Support for malloc(0) @@ -813,8 +807,8 @@ # Don't use -O3 with sanitizers. ['asan==0 and msan==0 and lsan==0 \ and tsan==0 and ubsan==0 and ubsan_vptr==0', { - 'cflags': ['-O3'], - 'cflags!': ['-O2'], + 'cflags': ['-O2'], + 'cflags!': ['-O3'], }, { 'cflags': ['-O2'], 'cflags!': ['-O3'], @@ -861,8 +855,8 @@ # Don't use -O3 with sanitizers. ['asan==0 and msan==0 and lsan==0 \ and tsan==0 and ubsan==0 and ubsan_vptr==0', { - 'cflags': ['-O3'], - 'cflags!': ['-O2'], + 'cflags': ['-O2'], + 'cflags!': ['-O3'], }, { 'cflags': ['-O2'], 'cflags!': ['-O3'],