|
|
@@ -1,6 +1,6 @@
|
|
|
Index: common.gypi
|
|
|
---- common.gypi.orig 2017-08-31 20:31:19.000000000 +0200
|
|
|
-+++ common.gypi 2017-09-01 10:30:26.531585000 +0200
|
|
|
+--- common.gypi.orig 2017-10-06 20:33:19.000000000 +0200
|
|
|
++++ common.gypi 2017-10-07 09:39:20.751676000 +0200
|
|
|
@@ -123,7 +123,7 @@
|
|
|
'variables': {
|
|
|
'v8_enable_handle_zapping': 0,
|
|
|
@@ -32,9 +32,9 @@ Index: common.gypi
|
|
|
},
|
|
|
'target_conditions': [
|
|
|
Index: configure
|
|
|
---- configure.orig 2017-08-31 20:31:19.000000000 +0200
|
|
|
-+++ configure 2017-09-01 10:30:26.531904000 +0200
|
|
|
-@@ -665,6 +665,8 @@
|
|
|
+--- configure.orig 2017-10-06 20:33:19.000000000 +0200
|
|
|
++++ configure 2017-10-07 09:39:20.752006000 +0200
|
|
|
+@@ -667,6 +667,8 @@
|
|
|
|
|
|
if is_clang:
|
|
|
o['variables']['llvm_version'] = get_llvm_version(CC)
|
|
|
@@ -44,20 +44,20 @@ Index: configure
|
|
|
# Need xcode_version or gas_version when openssl asm files are compiled.
|
|
|
if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
|
|
|
Index: deps/uv/common.gypi
|
|
|
---- deps/uv/common.gypi.orig 2017-08-31 20:31:22.000000000 +0200
|
|
|
-+++ deps/uv/common.gypi 2017-09-01 10:30:26.532055000 +0200
|
|
|
-@@ -47,7 +47,7 @@
|
|
|
+--- deps/uv/common.gypi.orig 2017-10-07 09:39:20.752192000 +0200
|
|
|
++++ deps/uv/common.gypi 2017-10-07 09:39:44.201257000 +0200
|
|
|
+@@ -46,7 +46,7 @@
|
|
|
'Release': {
|
|
|
'defines': [ 'NDEBUG' ],
|
|
|
'cflags': [
|
|
|
- '-O3',
|
|
|
+ '-O2',
|
|
|
- '-fstrict-aliasing',
|
|
|
],
|
|
|
'msvs_settings': {
|
|
|
+ 'VCCLCompilerTool': {
|
|
|
Index: deps/uv/uv.gyp
|
|
|
---- deps/uv/uv.gyp.orig 2017-08-31 20:31:22.000000000 +0200
|
|
|
-+++ deps/uv/uv.gyp 2017-09-01 10:30:26.532221000 +0200
|
|
|
+--- deps/uv/uv.gyp.orig 2017-10-06 20:33:32.000000000 +0200
|
|
|
++++ deps/uv/uv.gyp 2017-10-07 09:39:20.752463000 +0200
|
|
|
@@ -167,7 +167,7 @@
|
|
|
'src/unix/udp.c',
|
|
|
],
|
|
|
@@ -68,9 +68,9 @@ Index: deps/uv/uv.gyp
|
|
|
['OS=="solaris"', {
|
|
|
'ldflags': [ '-pthreads' ],
|
|
|
Index: deps/v8/gypfiles/toolchain.gypi
|
|
|
---- deps/v8/gypfiles/toolchain.gypi.orig 2017-08-31 20:31:22.000000000 +0200
|
|
|
-+++ deps/v8/gypfiles/toolchain.gypi 2017-09-01 10:30:26.532488000 +0200
|
|
|
-@@ -1100,12 +1100,6 @@
|
|
|
+--- deps/v8/gypfiles/toolchain.gypi.orig 2017-10-06 20:33:33.000000000 +0200
|
|
|
++++ deps/v8/gypfiles/toolchain.gypi 2017-10-07 09:39:20.752724000 +0200
|
|
|
+@@ -1079,12 +1079,6 @@
|
|
|
['OS=="solaris"', {
|
|
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
|
|
}],
|
|
|
@@ -83,7 +83,7 @@ Index: deps/v8/gypfiles/toolchain.gypi
|
|
|
['OS=="aix"', {
|
|
|
'defines': [
|
|
|
# Support for malloc(0)
|
|
|
-@@ -1215,8 +1209,8 @@
|
|
|
+@@ -1194,8 +1188,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', {
|
|
|
@@ -94,7 +94,7 @@ Index: deps/v8/gypfiles/toolchain.gypi
|
|
|
}, {
|
|
|
'cflags': ['-O2'],
|
|
|
'cflags!': ['-O3'],
|
|
|
-@@ -1333,8 +1327,8 @@
|
|
|
+@@ -1310,8 +1304,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', {
|
|
|
@@ -106,8 +106,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 2017-08-31 20:31:23.000000000 +0200
|
|
|
-+++ deps/v8/src/base/platform/platform-freebsd.cc 2017-09-01 10:30:26.532639000 +0200
|
|
|
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2017-10-06 20:33:34.000000000 +0200
|
|
|
++++ deps/v8/src/base/platform/platform-freebsd.cc 2017-10-07 09:39:20.752865000 +0200
|
|
|
@@ -25,6 +25,7 @@
|
|
|
#include <strings.h> // index
|
|
|
|
|
|
@@ -117,8 +117,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 2017-08-31 20:31:24.000000000 +0200
|
|
|
-+++ deps/v8/src/log-utils.cc 2017-09-01 10:30:26.532855000 +0200
|
|
|
+--- deps/v8/src/log-utils.cc.orig 2017-10-06 20:33:40.000000000 +0200
|
|
|
++++ deps/v8/src/log-utils.cc 2017-10-07 09:39:20.753082000 +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.
|
|
|
@@ -130,9 +130,9 @@ Index: deps/v8/src/log-utils.cc
|
|
|
|
|
|
#include "src/assert-scope.h"
|
|
|
Index: deps/v8/src/v8.gyp
|
|
|
---- deps/v8/src/v8.gyp.orig 2017-08-31 20:31:27.000000000 +0200
|
|
|
-+++ deps/v8/src/v8.gyp 2017-09-01 10:30:26.533230000 +0200
|
|
|
-@@ -2157,7 +2157,7 @@
|
|
|
+--- deps/v8/src/v8.gyp.orig 2017-10-06 20:33:43.000000000 +0200
|
|
|
++++ deps/v8/src/v8.gyp 2017-10-07 09:39:20.753468000 +0200
|
|
|
+@@ -2028,7 +2028,7 @@
|
|
|
['OS=="freebsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -141,7 +141,7 @@ Index: deps/v8/src/v8.gyp
|
|
|
]},
|
|
|
'sources': [
|
|
|
'base/debug/stack_trace_posix.cc',
|
|
|
-@@ -2172,7 +2172,7 @@
|
|
|
+@@ -2043,7 +2043,7 @@
|
|
|
['OS=="openbsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -150,7 +150,7 @@ Index: deps/v8/src/v8.gyp
|
|
|
]},
|
|
|
'sources': [
|
|
|
'base/platform/platform-openbsd.cc',
|
|
|
-@@ -2186,7 +2186,7 @@
|
|
|
+@@ -2057,7 +2057,7 @@
|
|
|
['OS=="netbsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -160,8 +160,8 @@ Index: deps/v8/src/v8.gyp
|
|
|
'sources': [
|
|
|
'base/debug/stack_trace_posix.cc',
|
|
|
Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
---- deps/v8/src/wasm/wasm-result.cc.orig 2017-08-31 20:31:27.000000000 +0200
|
|
|
-+++ deps/v8/src/wasm/wasm-result.cc 2017-09-01 10:30:26.533370000 +0200
|
|
|
+--- deps/v8/src/wasm/wasm-result.cc.orig 2017-10-06 20:33:43.000000000 +0200
|
|
|
++++ deps/v8/src/wasm/wasm-result.cc 2017-10-07 09:39:20.753608000 +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.
|
|
|
@@ -172,8 +172,8 @@ Index: deps/v8/src/wasm/wasm-result.cc
|
|
|
|
|
|
#include "src/factory.h"
|
|
|
Index: lib/dns.js
|
|
|
---- lib/dns.js.orig 2017-09-01 10:30:26.533608000 +0200
|
|
|
-+++ lib/dns.js 2017-09-01 10:37:14.796885000 +0200
|
|
|
+--- lib/dns.js.orig 2017-10-06 20:34:01.000000000 +0200
|
|
|
++++ lib/dns.js 2017-10-07 09:39:20.753785000 +0200
|
|
|
@@ -187,6 +187,10 @@
|
|
|
req.hostname = hostname;
|
|
|
req.oncomplete = all ? onlookupall : onlookup;
|
|
|
@@ -186,9 +186,9 @@ Index: lib/dns.js
|
|
|
if (err) {
|
|
|
process.nextTick(callback, errnoException(err, 'getaddrinfo', hostname));
|
|
|
Index: lib/module.js
|
|
|
---- lib/module.js.orig 2017-08-31 20:31:34.000000000 +0200
|
|
|
-+++ lib/module.js 2017-09-01 10:30:26.533900000 +0200
|
|
|
-@@ -630,7 +630,10 @@
|
|
|
+--- lib/module.js.orig 2017-10-06 20:34:02.000000000 +0200
|
|
|
++++ lib/module.js 2017-10-07 09:39:20.753967000 +0200
|
|
|
+@@ -662,7 +662,10 @@
|
|
|
} else {
|
|
|
prefixDir = path.resolve(process.execPath, '..', '..');
|
|
|
}
|
|
|
@@ -201,8 +201,8 @@ Index: lib/module.js
|
|
|
if (homeDir) {
|
|
|
paths.unshift(path.resolve(homeDir, '.node_libraries'));
|
|
|
Index: src/inspector_socket_server.cc
|
|
|
---- src/inspector_socket_server.cc.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/inspector_socket_server.cc 2017-09-01 10:30:26.534113000 +0200
|
|
|
+--- src/inspector_socket_server.cc.orig 2017-10-06 20:34:03.000000000 +0200
|
|
|
++++ src/inspector_socket_server.cc 2017-10-07 09:39:20.754182000 +0200
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
|
|
namespace {
|
|
|
@@ -213,9 +213,9 @@ Index: src/inspector_socket_server.cc
|
|
|
};
|
|
|
|
|
|
Index: src/node_constants.cc
|
|
|
---- src/node_constants.cc.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/node_constants.cc 2017-09-01 10:30:26.534344000 +0200
|
|
|
-@@ -37,10 +37,10 @@
|
|
|
+--- src/node_constants.cc.orig 2017-10-06 20:34:03.000000000 +0200
|
|
|
++++ src/node_constants.cc 2017-10-07 09:39:20.754391000 +0200
|
|
|
+@@ -35,10 +35,10 @@
|
|
|
#include <limits>
|
|
|
|
|
|
#if HAVE_OPENSSL
|
|
|
@@ -230,8 +230,8 @@ Index: src/node_constants.cc
|
|
|
#endif
|
|
|
|
|
|
Index: src/node_crypto.cc
|
|
|
---- src/node_crypto.cc.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/node_crypto.cc 2017-09-01 10:30:26.535108000 +0200
|
|
|
+--- src/node_crypto.cc.orig 2017-10-06 20:34:03.000000000 +0200
|
|
|
++++ src/node_crypto.cc 2017-10-07 09:39:20.755195000 +0200
|
|
|
@@ -51,6 +51,8 @@
|
|
|
#include <stdlib.h>
|
|
|
#include <string.h>
|
|
|
@@ -241,7 +241,7 @@ Index: src/node_crypto.cc
|
|
|
#define THROW_AND_RETURN_IF_NOT_STRING_OR_BUFFER(val, prefix) \
|
|
|
do { \
|
|
|
if (!Buffer::HasInstance(val) && !val->IsString()) { \
|
|
|
-@@ -5393,7 +5395,7 @@
|
|
|
+@@ -5384,7 +5386,7 @@
|
|
|
}
|
|
|
|
|
|
raw_keylen = args[3]->NumberValue();
|
|
|
@@ -251,8 +251,8 @@ Index: src/node_crypto.cc
|
|
|
type_error = "Bad key length";
|
|
|
goto err;
|
|
|
Index: src/node_crypto.h
|
|
|
---- src/node_crypto.h.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/node_crypto.h 2017-09-01 10:30:26.535298000 +0200
|
|
|
+--- src/node_crypto.h.orig 2017-10-06 20:34:03.000000000 +0200
|
|
|
++++ src/node_crypto.h 2017-10-07 09:39:20.755399000 +0200
|
|
|
@@ -38,20 +38,20 @@
|
|
|
|
|
|
#include "v8.h"
|
|
|
@@ -287,9 +287,9 @@ Index: src/node_crypto.h
|
|
|
#define EVP_F_EVP_DECRYPTFINAL 101
|
|
|
|
|
|
Index: src/node_internals.h
|
|
|
---- src/node_internals.h.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/node_internals.h 2017-09-01 10:30:26.535436000 +0200
|
|
|
-@@ -160,6 +160,7 @@
|
|
|
+--- src/node_internals.h.orig 2017-10-06 20:34:04.000000000 +0200
|
|
|
++++ src/node_internals.h 2017-10-07 09:39:20.755546000 +0200
|
|
|
+@@ -172,6 +172,7 @@
|
|
|
# define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
|
|
|
#endif
|
|
|
|
|
|
@@ -298,8 +298,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 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/tls_wrap.h 2017-09-01 10:30:26.535558000 +0200
|
|
|
+--- src/tls_wrap.h.orig 2017-10-06 20:34:05.000000000 +0200
|
|
|
++++ src/tls_wrap.h 2017-10-07 09:39:20.755676000 +0200
|
|
|
@@ -33,7 +33,7 @@
|
|
|
#include "util.h"
|
|
|
#include "v8.h"
|
|
|
@@ -310,8 +310,8 @@ Index: src/tls_wrap.h
|
|
|
namespace node {
|
|
|
|
|
|
Index: src/util.h
|
|
|
---- src/util.h.orig 2017-08-31 20:31:35.000000000 +0200
|
|
|
-+++ src/util.h 2017-09-01 10:30:26.535701000 +0200
|
|
|
+--- src/util.h.orig 2017-10-06 20:34:06.000000000 +0200
|
|
|
++++ src/util.h 2017-10-07 09:39:20.755832000 +0200
|
|
|
@@ -84,9 +84,11 @@
|
|
|
|
|
|
template <typename T> using remove_reference = std::remove_reference<T>;
|
|
|
@@ -346,9 +346,9 @@ Index: src/util.h
|
|
|
|
|
|
#define ASSIGN_OR_RETURN_UNWRAP(ptr, obj, ...) \
|
|
|
Index: tools/install.py
|
|
|
---- tools/install.py.orig 2017-08-31 20:31:44.000000000 +0200
|
|
|
-+++ tools/install.py 2017-09-01 10:30:26.535841000 +0200
|
|
|
-@@ -145,10 +145,7 @@
|
|
|
+--- tools/install.py.orig 2017-10-06 20:34:29.000000000 +0200
|
|
|
++++ tools/install.py 2017-10-07 09:39:20.755973000 +0200
|
|
|
+@@ -148,10 +148,7 @@
|
|
|
action(['deps/v8/tools/lldbinit'], 'share/doc/node/')
|
|
|
action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/')
|
|
|
|
