|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: common.gypi
|
|
|
|
|
--- common.gypi.orig 2018-04-15 20:41:38.000000000 +0200
|
|
|
|
|
+++ common.gypi 2018-04-15 20:46:51.405223000 +0200
|
|
|
|
|
--- common.gypi.orig 2018-05-05 10:41:06.000000000 +0200
|
|
|
|
|
+++ common.gypi 2018-05-05 10:44:33.534978000 +0200
|
|
|
|
|
@@ -163,7 +163,7 @@
|
|
|
|
|
'variables': {
|
|
|
|
|
'v8_enable_handle_zapping': 0,
|
|
|
|
@ -32,8 +32,8 @@ Index: common.gypi
|
|
|
|
|
},
|
|
|
|
|
'target_conditions': [
|
|
|
|
|
Index: deps/uv/common.gypi
|
|
|
|
|
--- deps/uv/common.gypi.orig 2018-04-15 20:41:35.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2018-04-15 20:46:51.405473000 +0200
|
|
|
|
|
--- deps/uv/common.gypi.orig 2018-05-05 10:41:04.000000000 +0200
|
|
|
|
|
+++ deps/uv/common.gypi 2018-05-05 10:44:33.535280000 +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 2018-04-15 20:41:35.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2018-04-15 20:46:51.405716000 +0200
|
|
|
|
|
--- deps/uv/uv.gyp.orig 2018-05-05 10:41:04.000000000 +0200
|
|
|
|
|
+++ deps/uv/uv.gyp 2018-05-05 10:44:33.535507000 +0200
|
|
|
|
|
@@ -173,7 +173,7 @@
|
|
|
|
|
'src/unix/udp.c',
|
|
|
|
|
],
|
|
|
|
@ -56,8 +56,8 @@ Index: deps/uv/uv.gyp
|
|
|
|
|
['OS=="solaris"', {
|
|
|
|
|
'ldflags': [ '-pthreads' ],
|
|
|
|
|
Index: deps/v8/gypfiles/toolchain.gypi
|
|
|
|
|
--- deps/v8/gypfiles/toolchain.gypi.orig 2018-04-15 20:41:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/gypfiles/toolchain.gypi 2018-04-15 20:46:51.406125000 +0200
|
|
|
|
|
--- deps/v8/gypfiles/toolchain.gypi.orig 2018-05-05 10:41:06.000000000 +0200
|
|
|
|
|
+++ deps/v8/gypfiles/toolchain.gypi 2018-05-05 10:44:33.535978000 +0200
|
|
|
|
|
@@ -1110,12 +1110,6 @@
|
|
|
|
|
['OS=="solaris"', {
|
|
|
|
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
|
|
|
@ -94,8 +94,8 @@ Index: deps/v8/gypfiles/toolchain.gypi
|
|
|
|
|
'cflags': ['-O2'],
|
|
|
|
|
'cflags!': ['-O3'],
|
|
|
|
|
Index: deps/v8/src/base/platform/platform-freebsd.cc
|
|
|
|
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-04-15 20:41:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2018-04-15 20:46:51.406339000 +0200
|
|
|
|
|
--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-05-05 10:41:04.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/base/platform/platform-freebsd.cc 2018-05-05 10:44:33.536186000 +0200
|
|
|
|
|
@@ -25,6 +25,7 @@
|
|
|
|
|
#include <strings.h> // index
|
|
|
|
|
|
|
|
|
@ -105,8 +105,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 2018-04-15 20:41:35.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/log-utils.cc 2018-04-15 20:46:51.406657000 +0200
|
|
|
|
|
--- deps/v8/src/log-utils.cc.orig 2018-05-05 10:41:04.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/log-utils.cc 2018-05-05 10:44:33.536386000 +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.
|
|
|
|
@ -118,8 +118,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 2018-04-15 20:41:38.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2018-04-15 20:46:51.406881000 +0200
|
|
|
|
|
--- deps/v8/src/wasm/wasm-result.cc.orig 2018-05-05 10:41:07.000000000 +0200
|
|
|
|
|
+++ deps/v8/src/wasm/wasm-result.cc 2018-05-05 10:44:33.536585000 +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.
|
|
|
|
@ -130,8 +130,8 @@ Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
|
|
|
|
|
#include "src/heap/factory.h"
|
|
|
|
|
Index: lib/dns.js
|
|
|
|
|
--- lib/dns.js.orig 2018-04-15 20:41:38.000000000 +0200
|
|
|
|
|
+++ lib/dns.js 2018-04-15 20:46:51.407104000 +0200
|
|
|
|
|
--- lib/dns.js.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ lib/dns.js 2018-05-05 10:44:33.536814000 +0200
|
|
|
|
|
@@ -136,6 +136,10 @@
|
|
|
|
|
req.hostname = hostname;
|
|
|
|
|
req.oncomplete = all ? onlookupall : onlookup;
|
|
|
|
@ -144,8 +144,8 @@ Index: lib/dns.js
|
|
|
|
|
if (err) {
|
|
|
|
|
process.nextTick(callback, dnsException(err, 'getaddrinfo', hostname));
|
|
|
|
|
Index: lib/internal/modules/cjs/loader.js
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2018-04-15 20:46:51.407384000 +0200
|
|
|
|
|
--- lib/internal/modules/cjs/loader.js.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ lib/internal/modules/cjs/loader.js 2018-05-05 10:44:33.537094000 +0200
|
|
|
|
|
@@ -743,7 +743,10 @@
|
|
|
|
|
} else {
|
|
|
|
|
prefixDir = path.resolve(process.execPath, '..', '..');
|
|
|
|
@ -159,8 +159,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 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2018-04-15 20:46:51.407707000 +0200
|
|
|
|
|
--- src/inspector_socket_server.cc.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ src/inspector_socket_server.cc 2018-05-05 10:44:33.537344000 +0200
|
|
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
bool include_protocol);
|
|
|
|
|
namespace {
|
|
|
|
@ -171,8 +171,8 @@ Index: src/inspector_socket_server.cc
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Index: src/node_constants.cc
|
|
|
|
|
--- src/node_constants.cc.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2018-04-15 20:46:51.408042000 +0200
|
|
|
|
|
--- src/node_constants.cc.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ src/node_constants.cc 2018-05-05 10:44:33.537651000 +0200
|
|
|
|
|
@@ -35,10 +35,10 @@
|
|
|
|
|
#include <limits>
|
|
|
|
|
|
|
|
|
@ -188,9 +188,9 @@ Index: src/node_constants.cc
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
Index: src/node_crypto.h
|
|
|
|
|
--- src/node_crypto.h.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/node_crypto.h 2018-04-15 20:46:51.408315000 +0200
|
|
|
|
|
@@ -36,20 +36,20 @@
|
|
|
|
|
--- src/node_crypto.h.orig 2018-05-05 10:44:33.538028000 +0200
|
|
|
|
|
+++ src/node_crypto.h 2018-05-05 10:45:43.869368000 +0200
|
|
|
|
|
@@ -36,22 +36,22 @@
|
|
|
|
|
|
|
|
|
|
#include "v8.h"
|
|
|
|
|
|
|
|
|
@ -206,14 +206,17 @@ Index: src/node_crypto.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/err.h"
|
|
|
|
|
+#include "openssl/evp.h"
|
|
|
|
|
+#include "openssl/obj_mac.h"
|
|
|
|
|
+#include "openssl/pem.h"
|
|
|
|
|
+#include "openssl/x509.h"
|
|
|
|
|
+#include "openssl/x509v3.h"
|
|
|
|
@ -224,9 +227,9 @@ Index: src/node_crypto.h
|
|
|
|
|
#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_set_tlsext_status_cb)
|
|
|
|
|
# define NODE__HAVE_TLSEXT_STATUS_CB
|
|
|
|
|
Index: src/node_internals.h
|
|
|
|
|
--- src/node_internals.h.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/node_internals.h 2018-04-15 20:46:51.408603000 +0200
|
|
|
|
|
@@ -275,6 +275,7 @@
|
|
|
|
|
--- src/node_internals.h.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ src/node_internals.h 2018-05-05 10:44:33.538458000 +0200
|
|
|
|
|
@@ -282,6 +282,7 @@
|
|
|
|
|
# define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@ -235,8 +238,8 @@ Index: src/node_internals.h
|
|
|
|
|
# define MUST_USE_RESULT __attribute__((warn_unused_result))
|
|
|
|
|
#else
|
|
|
|
|
Index: src/tls_wrap.h
|
|
|
|
|
--- src/tls_wrap.h.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/tls_wrap.h 2018-04-15 20:46:51.408797000 +0200
|
|
|
|
|
--- src/tls_wrap.h.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ src/tls_wrap.h 2018-05-05 10:44:33.538644000 +0200
|
|
|
|
|
@@ -32,7 +32,7 @@
|
|
|
|
|
#include "stream_wrap.h"
|
|
|
|
|
#include "v8.h"
|
|
|
|
@ -247,11 +250,11 @@ Index: src/tls_wrap.h
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
Index: src/util.h
|
|
|
|
|
--- src/util.h.orig 2018-04-15 20:41:36.000000000 +0200
|
|
|
|
|
+++ src/util.h 2018-04-15 20:46:51.409045000 +0200
|
|
|
|
|
@@ -86,9 +86,11 @@
|
|
|
|
|
|
|
|
|
|
template <typename T> using remove_reference = std::remove_reference<T>;
|
|
|
|
|
--- src/util.h.orig 2018-05-05 10:41:07.000000000 +0200
|
|
|
|
|
+++ src/util.h 2018-05-05 10:44:33.538909000 +0200
|
|
|
|
|
@@ -83,9 +83,11 @@
|
|
|
|
|
NO_RETURN void Assert(const char* const (*args)[4]);
|
|
|
|
|
void DumpBacktrace(FILE* fp);
|
|
|
|
|
|
|
|
|
|
+#undef FIXED_ONE_BYTE_STRING
|
|
|
|
|
#define FIXED_ONE_BYTE_STRING(isolate, string) \
|
|
|
|
@ -261,7 +264,7 @@ Index: src/util.h
|
|
|
|
|
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
|
|
|
|
|
void operator=(const TypeName&) = delete; \
|
|
|
|
|
void operator=(TypeName&&) = delete; \
|
|
|
|
|
@@ -126,13 +128,20 @@
|
|
|
|
|
@@ -123,13 +125,20 @@
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
@ -281,10 +284,10 @@ Index: src/util.h
|
|
|
|
|
+#undef UNREACHABLE
|
|
|
|
|
#define UNREACHABLE() ABORT()
|
|
|
|
|
|
|
|
|
|
#define ASSIGN_OR_RETURN_UNWRAP(ptr, obj, ...) \
|
|
|
|
|
// TAILQ-style intrusive list node.
|
|
|
|
|
Index: tools/install.py
|
|
|
|
|
--- tools/install.py.orig 2018-04-15 20:41:37.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2018-04-15 20:46:51.409229000 +0200
|
|
|
|
|
--- tools/install.py.orig 2018-05-05 10:41:05.000000000 +0200
|
|
|
|
|
+++ tools/install.py 2018-05-05 10:44:33.539137000 +0200
|
|
|
|
|
@@ -149,10 +149,7 @@
|
|
|
|
|
action(['deps/v8/tools/lldbinit'], 'share/doc/node/')
|
|
|
|
|
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
|
|
|
|