|
|
|
@ -1,16 +1,16 @@
|
|
|
|
|
Index: common.gypi
|
|
|
|
|
--- common.gypi.orig 2021-05-19 09:08:25.000000000 +0200
|
|
|
|
|
+++ common.gypi 2021-05-20 20:16:27.116128000 +0200
|
|
|
|
|
@@ -173,7 +173,7 @@
|
|
|
|
|
--- common.gypi.orig 2021-06-23 11:55:50.000000000 +0200
|
|
|
|
|
+++ common.gypi 2021-06-23 15:31:49.693136000 +0200
|
|
|
|
|
@@ -177,7 +177,7 @@
|
|
|
|
|
}],
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
- 'cflags': [ '-O3' ],
|
|
|
|
|
+ 'cflags': [ '-O2' ],
|
|
|
|
|
'conditions': [
|
|
|
|
|
['OS=="linux"', {
|
|
|
|
|
'conditions': [
|
|
|
|
|
@@ -374,7 +374,7 @@
|
|
|
|
|
['enable_lto=="true"', {
|
|
|
|
|
'cflags': ['<(lto)'],
|
|
|
|
|
@@ -381,7 +381,7 @@
|
|
|
|
|
'ldflags': [ '-pthread' ],
|
|
|
|
|
}],
|
|
|
|
|
[ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
|
|
|
|
@ -19,7 +19,7 @@ Index: common.gypi
|
|
|
|
|
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++14' ],
|
|
|
|
|
'defines': [ '__STDC_FORMAT_MACROS' ],
|
|
|
|
|
'ldflags': [ '-rdynamic' ],
|
|
|
|
|
@@ -486,10 +486,7 @@
|
|
|
|
|
@@ -493,10 +493,7 @@
|
|
|
|
|
'-fno-strict-aliasing',
|
|
|
|
|
],
|
|
|
|
|
'WARNING_CFLAGS': [
|
|
|
|
@ -32,8 +32,8 @@ Index: common.gypi
|
|
|
|
|
},
|
|
|
|
|
'target_conditions': [
|
|
|
|
|
Index: deps/uv/common.gypi
|
|
|
|
|
--- deps/uv/common.gypi.orig 2021-05-19 09:08:27.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2021-05-20 20:15:57.498550000 +0200
|
|
|
|
|
--- deps/uv/common.gypi.orig 2021-06-23 11:55:52.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2021-06-23 15:31:49.693283000 +0200
|
|
|
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
'Release': {
|
|
|
|
|
'defines': [ 'NDEBUG' ],
|
|
|
|
@ -44,8 +44,8 @@ Index: deps/uv/common.gypi
|
|
|
|
|
'msvs_settings': {
|
|
|
|
|
'VCCLCompilerTool': {
|
|
|
|
|
Index: deps/uv/uv.gyp
|
|
|
|
|
--- deps/uv/uv.gyp.orig 2021-05-19 09:08:27.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2021-05-20 20:15:57.498695000 +0200
|
|
|
|
|
--- deps/uv/uv.gyp.orig 2021-06-23 11:55:52.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2021-06-23 15:31:49.693426000 +0200
|
|
|
|
|
@@ -178,7 +178,7 @@
|
|
|
|
|
'src/unix/udp.c',
|
|
|
|
|
],
|
|
|
|
@ -56,8 +56,8 @@ Index: deps/uv/uv.gyp
|
|
|
|
|
['OS=="solaris"', {
|
|
|
|
|
'ldflags': [ '-pthreads' ],
|
|
|
|
|
Index: deps/v8/src/base/platform/platform-freebsd.cc
|
|
|
|
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2021-05-19 09:08:27.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2021-05-20 20:15:57.498828000 +0200
|
|
|
|
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2021-06-23 11:55:52.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2021-06-23 15:31:49.693553000 +0200
|
|
|
|
|
@@ -28,6 +28,7 @@
|
|
|
|
|
#include <strings.h> // index
|
|
|
|
|
|
|
|
|
@ -67,8 +67,8 @@ Index: deps/v8/src/base/platform/platform-freebsd.cc
|
|
|
|
|
#undef MAP_TYPE
|
|
|
|
|
|
|
|
|
|
Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2021-05-19 09:08:27.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2021-05-20 20:15:57.498953000 +0200
|
|
|
|
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2021-06-23 11:55:52.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2021-06-23 15:31:49.693675000 +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.
|
|
|
|
@ -79,9 +79,9 @@ Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
|
|
|
|
|
#include "src/execution/isolate-inl.h"
|
|
|
|
|
Index: lib/dns.js
|
|
|
|
|
--- lib/dns.js.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ lib/dns.js 2021-05-20 20:15:57.499085000 +0200
|
|
|
|
|
@@ -150,6 +150,10 @@
|
|
|
|
|
--- lib/dns.js.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ lib/dns.js 2021-06-23 15:31:49.693812000 +0200
|
|
|
|
|
@@ -154,6 +154,10 @@
|
|
|
|
|
req.hostname = hostname;
|
|
|
|
|
req.oncomplete = all ? onlookupall : onlookup;
|
|
|
|
|
|
|
|
|
@ -93,9 +93,9 @@ Index: lib/dns.js
|
|
|
|
|
req, toASCII(hostname), family, hints, verbatim
|
|
|
|
|
);
|
|
|
|
|
Index: lib/internal/modules/cjs/loader.js
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2021-05-20 20:15:57.499301000 +0200
|
|
|
|
|
@@ -1219,7 +1219,10 @@
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2021-06-23 15:31:49.694026000 +0200
|
|
|
|
|
@@ -1205,7 +1205,10 @@
|
|
|
|
|
path.resolve(process.execPath, '..') :
|
|
|
|
|
path.resolve(process.execPath, '..', '..');
|
|
|
|
|
|
|
|
|
@ -108,8 +108,8 @@ Index: lib/internal/modules/cjs/loader.js
|
|
|
|
|
if (homeDir) {
|
|
|
|
|
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|
|
|
|
|
Index: src/crypto/crypto_aes.cc
|
|
|
|
|
--- src/crypto/crypto_aes.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_aes.cc 2021-05-20 20:15:57.499447000 +0200
|
|
|
|
|
--- src/crypto/crypto_aes.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_aes.cc 2021-06-23 15:31:49.694178000 +0200
|
|
|
|
|
@@ -10,8 +10,8 @@
|
|
|
|
|
#include "threadpoolwork-inl.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -122,8 +122,8 @@ Index: src/crypto/crypto_aes.cc
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
|
|
Index: src/crypto/crypto_bio.cc
|
|
|
|
|
--- src/crypto/crypto_bio.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_bio.cc 2021-05-20 20:15:57.499576000 +0200
|
|
|
|
|
--- src/crypto/crypto_bio.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_bio.cc 2021-06-23 15:31:49.694312000 +0200
|
|
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
|
#include "allocated_buffer-inl.h"
|
|
|
|
|
#include "util-inl.h"
|
|
|
|
@ -134,8 +134,8 @@ Index: src/crypto/crypto_bio.cc
|
|
|
|
|
#include <climits>
|
|
|
|
|
#include <cstring>
|
|
|
|
|
Index: src/crypto/crypto_common.cc
|
|
|
|
|
--- src/crypto/crypto_common.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_common.cc 2021-05-20 20:15:57.499748000 +0200
|
|
|
|
|
--- src/crypto/crypto_common.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_common.cc 2021-06-23 15:31:49.694514000 +0200
|
|
|
|
|
@@ -11,14 +11,14 @@
|
|
|
|
|
#include "memory_tracker-inl.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -160,8 +160,8 @@ Index: src/crypto/crypto_common.cc
|
|
|
|
|
#include <string>
|
|
|
|
|
#include <unordered_map>
|
|
|
|
|
Index: src/crypto/crypto_common.h
|
|
|
|
|
--- src/crypto/crypto_common.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_common.h 2021-05-20 20:15:57.499861000 +0200
|
|
|
|
|
--- src/crypto/crypto_common.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_common.h 2021-06-23 15:31:49.694623000 +0200
|
|
|
|
|
@@ -5,8 +5,8 @@
|
|
|
|
|
|
|
|
|
|
#include "node_crypto.h"
|
|
|
|
@ -174,16 +174,18 @@ Index: src/crypto/crypto_common.h
|
|
|
|
|
#include <string>
|
|
|
|
|
#include <unordered_map>
|
|
|
|
|
Index: src/crypto/crypto_context.cc
|
|
|
|
|
--- src/crypto/crypto_context.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_context.cc 2021-05-20 20:15:57.500051000 +0200
|
|
|
|
|
@@ -11,10 +11,10 @@
|
|
|
|
|
--- src/crypto/crypto_context.cc.orig 2021-06-23 15:31:49.694910000 +0200
|
|
|
|
|
+++ src/crypto/crypto_context.cc 2021-06-23 20:08:04.115001000 +0200
|
|
|
|
|
@@ -11,11 +11,11 @@
|
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
|
|
|
|
|
-#include <openssl/x509.h>
|
|
|
|
|
-#include <openssl/pkcs12.h>
|
|
|
|
|
-#include <openssl/rand.h>
|
|
|
|
|
+#include "openssl/x509.h"
|
|
|
|
|
+#include "openssl/pkcs12.h"
|
|
|
|
|
+#include "openssl/rand.h"
|
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
|
-#include <openssl/engine.h>
|
|
|
|
|
+#include "openssl/engine.h"
|
|
|
|
@ -191,8 +193,8 @@ Index: src/crypto/crypto_context.cc
|
|
|
|
|
|
|
|
|
|
namespace node {
|
|
|
|
|
Index: src/crypto/crypto_dsa.cc
|
|
|
|
|
--- src/crypto/crypto_dsa.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_dsa.cc 2021-05-20 20:15:57.500162000 +0200
|
|
|
|
|
--- src/crypto/crypto_dsa.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_dsa.cc 2021-06-23 15:31:49.695132000 +0200
|
|
|
|
|
@@ -7,8 +7,8 @@
|
|
|
|
|
#include "threadpoolwork-inl.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -205,8 +207,8 @@ Index: src/crypto/crypto_dsa.cc
|
|
|
|
|
#include <cstdio>
|
|
|
|
|
|
|
|
|
|
Index: src/crypto/crypto_keys.h
|
|
|
|
|
--- src/crypto/crypto_keys.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_keys.h 2021-05-20 20:15:57.500288000 +0200
|
|
|
|
|
--- src/crypto/crypto_keys.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_keys.h 2021-06-23 15:31:49.695249000 +0200
|
|
|
|
|
@@ -11,7 +11,7 @@
|
|
|
|
|
#include "node_worker.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -217,8 +219,8 @@ Index: src/crypto/crypto_keys.h
|
|
|
|
|
#include <memory>
|
|
|
|
|
#include <string>
|
|
|
|
|
Index: src/crypto/crypto_rsa.cc
|
|
|
|
|
--- src/crypto/crypto_rsa.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_rsa.cc 2021-05-20 20:15:57.500419000 +0200
|
|
|
|
|
--- src/crypto/crypto_rsa.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_rsa.cc 2021-06-23 15:31:49.695386000 +0200
|
|
|
|
|
@@ -10,8 +10,8 @@
|
|
|
|
|
#include "threadpoolwork-inl.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -231,8 +233,8 @@ Index: src/crypto/crypto_rsa.cc
|
|
|
|
|
namespace node {
|
|
|
|
|
|
|
|
|
|
Index: src/crypto/crypto_spkac.h
|
|
|
|
|
--- src/crypto/crypto_spkac.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_spkac.h 2021-05-20 20:15:57.500520000 +0200
|
|
|
|
|
--- src/crypto/crypto_spkac.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_spkac.h 2021-06-23 15:31:49.695479000 +0200
|
|
|
|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
#include "env.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -243,8 +245,8 @@ Index: src/crypto/crypto_spkac.h
|
|
|
|
|
namespace node {
|
|
|
|
|
namespace crypto {
|
|
|
|
|
Index: src/crypto/crypto_timing.cc
|
|
|
|
|
--- src/crypto/crypto_timing.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_timing.cc 2021-05-20 20:15:57.500619000 +0200
|
|
|
|
|
--- src/crypto/crypto_timing.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_timing.cc 2021-06-23 15:31:49.695572000 +0200
|
|
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
#include "node.h"
|
|
|
|
@ -255,8 +257,8 @@ Index: src/crypto/crypto_timing.cc
|
|
|
|
|
namespace node {
|
|
|
|
|
|
|
|
|
|
Index: src/crypto/crypto_tls.h
|
|
|
|
|
--- src/crypto/crypto_tls.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_tls.h 2021-05-20 20:15:57.500743000 +0200
|
|
|
|
|
--- src/crypto/crypto_tls.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_tls.h 2021-06-23 15:31:49.695687000 +0200
|
|
|
|
|
@@ -32,7 +32,7 @@
|
|
|
|
|
#include "stream_wrap.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -267,8 +269,8 @@ Index: src/crypto/crypto_tls.h
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
Index: src/crypto/crypto_util.h
|
|
|
|
|
--- src/crypto/crypto_util.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_util.h 2021-05-20 20:15:57.500905000 +0200
|
|
|
|
|
--- src/crypto/crypto_util.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/crypto/crypto_util.h 2021-06-23 15:31:49.695847000 +0200
|
|
|
|
|
@@ -12,15 +12,15 @@
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
#include "string_bytes.h"
|
|
|
|
@ -294,8 +296,8 @@ Index: src/crypto/crypto_util.h
|
|
|
|
|
// The FIPS-related functions are only available
|
|
|
|
|
// when the OpenSSL itself was compiled with FIPS support.
|
|
|
|
|
Index: src/inspector_socket_server.cc
|
|
|
|
|
--- src/inspector_socket_server.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2021-05-20 20:15:57.501057000 +0200
|
|
|
|
|
--- src/inspector_socket_server.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2021-06-23 15:31:49.695981000 +0200
|
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
|
bool include_protocol);
|
|
|
|
|
namespace {
|
|
|
|
@ -306,8 +308,8 @@ Index: src/inspector_socket_server.cc
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Index: src/node_constants.cc
|
|
|
|
|
--- src/node_constants.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2021-05-20 20:15:57.501235000 +0200
|
|
|
|
|
--- src/node_constants.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2021-06-23 15:31:49.696154000 +0200
|
|
|
|
|
@@ -36,10 +36,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -323,8 +325,8 @@ Index: src/node_constants.cc
|
|
|
|
|
#endif // HAVE_OPENSSL
|
|
|
|
|
|
|
|
|
|
Index: src/node_metadata.cc
|
|
|
|
|
--- src/node_metadata.cc.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/node_metadata.cc 2021-05-20 20:15:57.501339000 +0200
|
|
|
|
|
--- src/node_metadata.cc.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/node_metadata.cc 2021-06-23 15:31:49.696254000 +0200
|
|
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
#include "zlib.h"
|
|
|
|
|
|
|
|
|
@ -335,8 +337,8 @@ Index: src/node_metadata.cc
|
|
|
|
|
|
|
|
|
|
#ifdef OPENSSL_INFO_QUIC
|
|
|
|
|
Index: src/util.h
|
|
|
|
|
--- src/util.h.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ src/util.h 2021-05-20 20:15:57.501507000 +0200
|
|
|
|
|
--- src/util.h.orig 2021-06-23 11:55:54.000000000 +0200
|
|
|
|
|
+++ src/util.h 2021-06-23 15:31:49.696424000 +0200
|
|
|
|
|
@@ -150,14 +150,23 @@
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
|
|
|
@ -370,8 +372,8 @@ Index: src/util.h
|
|
|
|
|
ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__)
|
|
|
|
|
|
|
|
|
|
Index: tools/install.py
|
|
|
|
|
--- tools/install.py.orig 2021-05-19 09:08:29.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2021-05-20 20:15:57.501644000 +0200
|
|
|
|
|
--- tools/install.py.orig 2021-06-23 11:55:55.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2021-06-23 15:31:49.696548000 +0200
|
|
|
|
|
@@ -147,10 +147,7 @@
|
|
|
|
|
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
|
|
|
|
|
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
|
|
|
@ -385,8 +387,8 @@ Index: tools/install.py
|
|
|
|
|
if 'true' == variables.get('node_install_npm'): npm_files(action)
|
|
|
|
|
|
|
|
|
|
Index: tools/v8_gypfiles/toolchain.gypi
|
|
|
|
|
--- tools/v8_gypfiles/toolchain.gypi.orig 2021-05-19 09:08:30.000000000 +0200
|
|
|
|
|
+++ tools/v8_gypfiles/toolchain.gypi 2021-05-20 20:15:57.501867000 +0200
|
|
|
|
|
--- tools/v8_gypfiles/toolchain.gypi.orig 2021-06-23 11:55:55.000000000 +0200
|
|
|
|
|
+++ tools/v8_gypfiles/toolchain.gypi 2021-06-23 15:31:49.696756000 +0200
|
|
|
|
|
@@ -1087,12 +1087,6 @@
|
|
|
|
|
['OS=="solaris"', {
|
|
|
|
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
|
|
|
|