|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: common.gypi
|
|
|
|
|
--- common.gypi.orig 2019-04-01 20:19:07.000000000 +0200
|
|
|
|
|
+++ common.gypi 2019-04-01 20:23:41.457369000 +0200
|
|
|
|
|
--- common.gypi.orig 2019-04-09 23:43:33.000000000 +0200
|
|
|
|
|
+++ common.gypi 2019-04-09 23:46:57.971977000 +0200
|
|
|
|
|
@@ -165,7 +165,7 @@
|
|
|
|
|
}],
|
|
|
|
|
],
|
|
|
|
|
@ -32,8 +32,8 @@ Index: common.gypi
|
|
|
|
|
},
|
|
|
|
|
'target_conditions': [
|
|
|
|
|
Index: deps/uv/common.gypi
|
|
|
|
|
--- deps/uv/common.gypi.orig 2019-04-01 20:19:08.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2019-04-01 20:23:41.457644000 +0200
|
|
|
|
|
--- deps/uv/common.gypi.orig 2019-04-09 23:43:35.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2019-04-09 23:46:57.972137000 +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 2019-04-01 20:19:08.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2019-04-01 20:23:41.457896000 +0200
|
|
|
|
|
--- deps/uv/uv.gyp.orig 2019-04-09 23:43:35.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2019-04-09 23:46:57.972283000 +0200
|
|
|
|
|
@@ -175,7 +175,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 2019-04-01 20:19:08.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2019-04-01 20:23:41.458628000 +0200
|
|
|
|
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2019-04-09 23:43:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2019-04-09 23:46:57.972422000 +0200
|
|
|
|
|
@@ -25,6 +25,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/log-utils.cc
|
|
|
|
|
--- deps/v8/src/log-utils.cc.orig 2019-04-01 20:19:09.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/log-utils.cc 2019-04-01 20:23:41.458885000 +0200
|
|
|
|
|
--- deps/v8/src/log-utils.cc.orig 2019-04-09 23:43:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/log-utils.cc 2019-04-09 23:46:57.972560000 +0200
|
|
|
|
|
@@ -2,6 +2,9 @@
|
|
|
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
@ -80,8 +80,8 @@ Index: deps/v8/src/log-utils.cc
|
|
|
|
|
|
|
|
|
|
#include "src/assert-scope.h"
|
|
|
|
|
Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2019-04-01 20:19:09.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2019-04-01 20:23:41.459126000 +0200
|
|
|
|
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2019-04-09 23:43:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2019-04-09 23:46:57.972695000 +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.
|
|
|
|
|
@ -92,8 +92,8 @@ Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
|
|
|
|
|
#include "src/heap/factory.h"
|
|
|
|
|
Index: lib/dns.js
|
|
|
|
|
--- lib/dns.js.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ lib/dns.js 2019-04-01 20:23:41.459376000 +0200
|
|
|
|
|
--- lib/dns.js.orig 2019-04-09 23:46:57.972883000 +0200
|
|
|
|
|
+++ lib/dns.js 2019-04-09 23:47:29.222068000 +0200
|
|
|
|
|
@@ -140,6 +140,10 @@
|
|
|
|
|
req.hostname = hostname;
|
|
|
|
|
req.oncomplete = all ? onlookupall : onlookup;
|
|
|
|
|
@ -102,13 +102,13 @@ Index: lib/dns.js
|
|
|
|
|
+ if (process.platform === "freebsd")
|
|
|
|
|
+ hints &= ~(exports.V4MAPPED);
|
|
|
|
|
+
|
|
|
|
|
var err = cares.getaddrinfo(req, toASCII(hostname), family, hints, verbatim);
|
|
|
|
|
if (err) {
|
|
|
|
|
process.nextTick(callback, dnsException(err, 'getaddrinfo', hostname));
|
|
|
|
|
const err = cares.getaddrinfo(
|
|
|
|
|
req, toASCII(hostname), family, hints, verbatim
|
|
|
|
|
);
|
|
|
|
|
Index: lib/internal/modules/cjs/loader.js
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2019-04-01 20:23:41.459783000 +0200
|
|
|
|
|
@@ -932,7 +932,10 @@
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2019-04-09 23:46:57.973173000 +0200
|
|
|
|
|
@@ -859,7 +859,10 @@
|
|
|
|
|
} else {
|
|
|
|
|
prefixDir = path.resolve(process.execPath, '..', '..');
|
|
|
|
|
}
|
|
|
|
|
@ -121,8 +121,8 @@ Index: lib/internal/modules/cjs/loader.js
|
|
|
|
|
if (homeDir) {
|
|
|
|
|
paths.unshift(path.resolve(homeDir, '.node_libraries'));
|
|
|
|
|
Index: src/inspector_socket_server.cc
|
|
|
|
|
--- src/inspector_socket_server.cc.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2019-04-01 20:23:41.460053000 +0200
|
|
|
|
|
--- src/inspector_socket_server.cc.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2019-04-09 23:46:57.973324000 +0200
|
|
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
bool include_protocol);
|
|
|
|
|
namespace {
|
|
|
|
|
@ -133,8 +133,8 @@ Index: src/inspector_socket_server.cc
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Index: src/node_constants.cc
|
|
|
|
|
--- src/node_constants.cc.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2019-04-01 20:23:41.460438000 +0200
|
|
|
|
|
--- src/node_constants.cc.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2019-04-09 23:46:57.973526000 +0200
|
|
|
|
|
@@ -34,10 +34,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -149,49 +149,54 @@ Index: src/node_constants.cc
|
|
|
|
|
#endif // !OPENSSL_NO_ENGINE
|
|
|
|
|
#endif // HAVE_OPENSSL
|
|
|
|
|
|
|
|
|
|
Index: src/node_crypto.h
|
|
|
|
|
--- src/node_crypto.h.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ src/node_crypto.h 2019-04-01 20:23:41.460753000 +0200
|
|
|
|
|
@@ -36,22 +36,22 @@
|
|
|
|
|
|
|
|
|
|
Index: src/node_crypto.cc
|
|
|
|
|
--- src/node_crypto.cc.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ src/node_crypto.cc 2019-04-09 23:48:00.665758000 +0200
|
|
|
|
|
@@ -36,17 +36,17 @@
|
|
|
|
|
#include "util-inl.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
|
|
|
|
|
-#include <openssl/ssl.h>
|
|
|
|
|
-#include <openssl/ec.h>
|
|
|
|
|
-#include <openssl/ecdh.h>
|
|
|
|
|
+#include "openssl/ssl.h"
|
|
|
|
|
+#include "openssl/ec.h"
|
|
|
|
|
+#include "openssl/ecdh.h"
|
|
|
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
|
|
|
-# include <openssl/engine.h>
|
|
|
|
|
+# include "openssl/engine.h"
|
|
|
|
|
#endif // !OPENSSL_NO_ENGINE
|
|
|
|
|
-#include <openssl/err.h>
|
|
|
|
|
-#include <openssl/evp.h>
|
|
|
|
|
+#include "openssl/err.h"
|
|
|
|
|
+#include "openssl/evp.h"
|
|
|
|
|
// TODO(shigeki) Remove this after upgrading to 1.1.1
|
|
|
|
|
-#include <openssl/obj_mac.h>
|
|
|
|
|
-#include <openssl/pem.h>
|
|
|
|
|
-#include <openssl/x509.h>
|
|
|
|
|
-#include <openssl/x509v3.h>
|
|
|
|
|
-#include <openssl/hmac.h>
|
|
|
|
|
-#include <openssl/rand.h>
|
|
|
|
|
-#include <openssl/pkcs12.h>
|
|
|
|
|
+#include "openssl/obj_mac.h"
|
|
|
|
|
+#include "openssl/evp.h"
|
|
|
|
|
+#include "openssl/pem.h"
|
|
|
|
|
+#include "openssl/x509.h"
|
|
|
|
|
+#include "openssl/x509v3.h"
|
|
|
|
|
+#include "openssl/hmac.h"
|
|
|
|
|
+#include "openssl/rand.h"
|
|
|
|
|
+#include "openssl/pkcs12.h"
|
|
|
|
|
|
|
|
|
|
#include <cerrno>
|
|
|
|
|
#include <climits> // INT_MAX
|
|
|
|
|
Index: src/node_crypto.h
|
|
|
|
|
--- src/node_crypto.h.orig 2019-04-09 23:46:57.973775000 +0200
|
|
|
|
|
+++ src/node_crypto.h 2019-04-09 23:47:44.511570000 +0200
|
|
|
|
|
@@ -33,8 +33,8 @@
|
|
|
|
|
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
|
|
|
|
|
-#include <openssl/err.h>
|
|
|
|
|
-#include <openssl/ssl.h>
|
|
|
|
|
+#include "openssl/err.h"
|
|
|
|
|
+#include "openssl/ssl.h"
|
|
|
|
|
|
|
|
|
|
namespace node {
|
|
|
|
|
namespace crypto {
|
|
|
|
|
Index: src/tls_wrap.h
|
|
|
|
|
--- src/tls_wrap.h.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ src/tls_wrap.h 2019-04-01 20:23:41.460966000 +0200
|
|
|
|
|
@@ -32,7 +32,7 @@
|
|
|
|
|
--- src/tls_wrap.h.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ src/tls_wrap.h 2019-04-09 23:46:57.973969000 +0200
|
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
#include "stream_wrap.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
|
|
|
|
|
@ -201,8 +206,8 @@ Index: src/tls_wrap.h
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
Index: src/util.h
|
|
|
|
|
--- src/util.h.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ src/util.h 2019-04-01 20:23:41.461287000 +0200
|
|
|
|
|
--- src/util.h.orig 2019-04-09 23:43:36.000000000 +0200
|
|
|
|
|
+++ src/util.h 2019-04-09 23:46:57.974134000 +0200
|
|
|
|
|
@@ -131,14 +131,23 @@
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
|
|
|
|
@ -236,8 +241,8 @@ Index: src/util.h
|
|
|
|
|
|
|
|
|
|
// TAILQ-style intrusive list node.
|
|
|
|
|
Index: tools/install.py
|
|
|
|
|
--- tools/install.py.orig 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2019-04-01 20:23:41.461535000 +0200
|
|
|
|
|
--- tools/install.py.orig 2019-04-09 23:43:37.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2019-04-09 23:46:57.974263000 +0200
|
|
|
|
|
@@ -152,10 +152,7 @@
|
|
|
|
|
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
|
|
|
|
|
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
|
|
|
|
@ -251,8 +256,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 2019-04-01 20:19:10.000000000 +0200
|
|
|
|
|
+++ tools/v8_gypfiles/toolchain.gypi 2019-04-01 20:23:41.458385000 +0200
|
|
|
|
|
--- tools/v8_gypfiles/toolchain.gypi.orig 2019-04-09 23:43:38.000000000 +0200
|
|
|
|
|
+++ tools/v8_gypfiles/toolchain.gypi 2019-04-09 23:46:57.974512000 +0200
|
|
|
|
|
@@ -1115,12 +1115,6 @@
|
|
|
|
|
['OS=="solaris"', {
|
|
|
|
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
|
|
|
|
|