|
|
@@ -1,7 +1,7 @@
|
|
|
Index: common.gypi
|
|
|
---- common.gypi.orig 2016-07-21 22:44:27.000000000 +0200
|
|
|
-+++ common.gypi 2016-07-22 18:06:17.902175439 +0200
|
|
|
-@@ -240,7 +240,7 @@
|
|
|
+--- common.gypi.orig 2016-10-12 21:04:12.000000000 +0200
|
|
|
++++ common.gypi 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -267,7 +267,7 @@
|
|
|
'ldflags': [ '-pthread' ],
|
|
|
}],
|
|
|
[ 'OS in "linux freebsd openbsd solaris android aix"', {
|
|
|
@@ -10,7 +10,7 @@ Index: common.gypi
|
|
|
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ],
|
|
|
'ldflags': [ '-rdynamic' ],
|
|
|
'target_conditions': [
|
|
|
-@@ -323,10 +323,7 @@
|
|
|
+@@ -355,10 +355,7 @@
|
|
|
'-fno-strict-aliasing',
|
|
|
],
|
|
|
'WARNING_CFLAGS': [
|
|
|
@@ -23,8 +23,8 @@ Index: common.gypi
|
|
|
},
|
|
|
'target_conditions': [
|
|
|
Index: deps/uv/uv.gyp
|
|
|
---- deps/uv/uv.gyp.orig 2016-07-21 22:44:30.000000000 +0200
|
|
|
-+++ deps/uv/uv.gyp 2016-07-22 18:06:17.902175439 +0200
|
|
|
+--- deps/uv/uv.gyp.orig 2016-10-12 21:04:17.000000000 +0200
|
|
|
++++ deps/uv/uv.gyp 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -157,7 +157,7 @@
|
|
|
'src/unix/udp.c',
|
|
|
],
|
|
|
@@ -35,9 +35,9 @@ Index: deps/uv/uv.gyp
|
|
|
['OS=="solaris"', {
|
|
|
'ldflags': [ '-pthreads' ],
|
|
|
Index: deps/v8/build/toolchain.gypi
|
|
|
---- deps/v8/build/toolchain.gypi.orig 2016-07-21 22:44:31.000000000 +0200
|
|
|
-+++ deps/v8/build/toolchain.gypi 2016-07-22 18:06:17.902175439 +0200
|
|
|
-@@ -1074,12 +1074,6 @@
|
|
|
+--- deps/v8/build/toolchain.gypi.orig 2016-10-12 21:04:17.000000000 +0200
|
|
|
++++ deps/v8/build/toolchain.gypi 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -1075,12 +1075,6 @@
|
|
|
['OS=="solaris"', {
|
|
|
'defines': [ '__C99FEATURES__=1' ], # isinf() etc.
|
|
|
}],
|
|
|
@@ -51,8 +51,8 @@ Index: deps/v8/build/toolchain.gypi
|
|
|
'defines': [
|
|
|
# Support for malloc(0)
|
|
|
Index: deps/v8/src/base/platform/platform-freebsd.cc
|
|
|
---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2016-07-21 22:44:32.000000000 +0200
|
|
|
-+++ deps/v8/src/base/platform/platform-freebsd.cc 2016-07-22 18:06:17.902175439 +0200
|
|
|
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2016-10-12 21:04:17.000000000 +0200
|
|
|
++++ deps/v8/src/base/platform/platform-freebsd.cc 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -25,6 +25,7 @@
|
|
|
#include <strings.h> // index
|
|
|
|
|
|
@@ -62,8 +62,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 2016-07-21 22:44:33.000000000 +0200
|
|
|
-+++ deps/v8/src/log-utils.cc 2016-07-22 18:06:17.902175439 +0200
|
|
|
+--- deps/v8/src/log-utils.cc.orig 2016-10-12 21:04:18.000000000 +0200
|
|
|
++++ deps/v8/src/log-utils.cc 2016-10-13 21:19:22.949419695 +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.
|
|
|
@@ -75,8 +75,8 @@ Index: deps/v8/src/log-utils.cc
|
|
|
|
|
|
#include "src/assert-scope.h"
|
|
|
Index: deps/v8/src/log-utils.h
|
|
|
---- deps/v8/src/log-utils.h.orig 2016-07-21 22:44:33.000000000 +0200
|
|
|
-+++ deps/v8/src/log-utils.h 2016-07-22 18:06:17.902175439 +0200
|
|
|
+--- deps/v8/src/log-utils.h.orig 2016-10-12 21:04:18.000000000 +0200
|
|
|
++++ deps/v8/src/log-utils.h 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
|
#include <cstdarg>
|
|
|
@@ -86,9 +86,9 @@ Index: deps/v8/src/log-utils.h
|
|
|
#include "src/base/platform/mutex.h"
|
|
|
#include "src/flags.h"
|
|
|
Index: deps/v8/tools/gyp/v8.gyp
|
|
|
---- deps/v8/tools/gyp/v8.gyp.orig 2016-07-21 22:44:41.000000000 +0200
|
|
|
-+++ deps/v8/tools/gyp/v8.gyp 2016-07-22 18:06:17.902175439 +0200
|
|
|
-@@ -1767,7 +1767,7 @@
|
|
|
+--- deps/v8/tools/gyp/v8.gyp.orig 2016-10-12 21:04:25.000000000 +0200
|
|
|
++++ deps/v8/tools/gyp/v8.gyp 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -1827,7 +1827,7 @@
|
|
|
['OS=="freebsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -97,7 +97,7 @@ Index: deps/v8/tools/gyp/v8.gyp
|
|
|
]},
|
|
|
'sources': [
|
|
|
'../../src/base/platform/platform-freebsd.cc',
|
|
|
-@@ -1778,7 +1778,7 @@
|
|
|
+@@ -1838,7 +1838,7 @@
|
|
|
['OS=="openbsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -106,7 +106,7 @@ Index: deps/v8/tools/gyp/v8.gyp
|
|
|
]},
|
|
|
'sources': [
|
|
|
'../../src/base/platform/platform-openbsd.cc',
|
|
|
-@@ -1789,7 +1789,7 @@
|
|
|
+@@ -1849,7 +1849,7 @@
|
|
|
['OS=="netbsd"', {
|
|
|
'link_settings': {
|
|
|
'libraries': [
|
|
|
@@ -115,10 +115,48 @@ Index: deps/v8/tools/gyp/v8.gyp
|
|
|
]},
|
|
|
'sources': [
|
|
|
'../../src/base/platform/platform-openbsd.cc',
|
|
|
+Index: deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template
|
|
|
+--- deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template.orig 2016-10-12 21:04:26.000000000 +0200
|
|
|
++++ deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template 2016-10-13 21:19:22.959504706 +0200
|
|
|
+@@ -4,6 +4,7 @@
|
|
|
+
|
|
|
+ #include <cstdlib>
|
|
|
+ #include <cstring>
|
|
|
++#include <cstdio>
|
|
|
+ #include <string>
|
|
|
+
|
|
|
+ namespace blink {
|
|
|
+@@ -13,22 +14,22 @@
|
|
|
+
|
|
|
+ void intToStr(int number, char* buffer, size_t length)
|
|
|
+ {
|
|
|
+- std::snprintf(buffer, length, "%d", number);
|
|
|
++ snprintf(buffer, length, "%d", number);
|
|
|
+ }
|
|
|
+
|
|
|
+ void doubleToStr(double number, char* buffer, size_t length)
|
|
|
+ {
|
|
|
+- std::snprintf(buffer, length, "%f", number);
|
|
|
++ snprintf(buffer, length, "%f", number);
|
|
|
+ }
|
|
|
+
|
|
|
+ void doubleToStr3(double number, char* buffer, size_t length)
|
|
|
+ {
|
|
|
+- std::snprintf(buffer, length, "%.3g", number);
|
|
|
++ snprintf(buffer, length, "%.3g", number);
|
|
|
+ }
|
|
|
+
|
|
|
+ void doubleToStr6(double number, char* buffer, size_t length)
|
|
|
+ {
|
|
|
+- std::snprintf(buffer, length, "%.6g", number);
|
|
|
++ snprintf(buffer, length, "%.6g", number);
|
|
|
+ }
|
|
|
+
|
|
|
+ double strToDouble(const char* buffer, bool* ok)
|
|
|
Index: lib/dns.js
|
|
|
---- lib/dns.js.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ lib/dns.js 2016-07-22 18:06:17.912250603 +0200
|
|
|
-@@ -164,6 +164,10 @@
|
|
|
+--- lib/dns.js.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ lib/dns.js 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -161,6 +161,10 @@
|
|
|
req.hostname = hostname;
|
|
|
req.oncomplete = all ? onlookupall : onlookup;
|
|
|
|
|
|
@@ -130,9 +168,9 @@ Index: lib/dns.js
|
|
|
if (err) {
|
|
|
callback(errnoException(err, 'getaddrinfo', hostname));
|
|
|
Index: lib/module.js
|
|
|
---- lib/module.js.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ lib/module.js 2016-07-22 18:06:17.912250603 +0200
|
|
|
-@@ -587,7 +587,10 @@
|
|
|
+--- lib/module.js.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ lib/module.js 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -616,7 +616,10 @@
|
|
|
homeDir = process.env.HOME;
|
|
|
}
|
|
|
|
|
|
@@ -144,9 +182,21 @@ Index: lib/module.js
|
|
|
|
|
|
if (homeDir) {
|
|
|
paths.unshift(path.resolve(homeDir, '.node_libraries'));
|
|
|
+Index: src/inspector_agent.cc
|
|
|
+--- src/inspector_agent.cc.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ src/inspector_agent.cc 2016-10-13 21:19:45.820243431 +0200
|
|
|
+@@ -42,7 +42,7 @@
|
|
|
+ const char DEVTOOLS_PATH[] = "/node";
|
|
|
+ const char DEVTOOLS_HASH[] = V8_INSPECTOR_REVISION;
|
|
|
+
|
|
|
+-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 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/node_constants.cc 2016-07-22 18:06:33.152166290 +0200
|
|
|
+--- src/node_constants.cc.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ src/node_constants.cc 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -14,10 +14,10 @@
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
@@ -162,8 +212,8 @@ Index: src/node_constants.cc
|
|
|
#endif
|
|
|
|
|
|
Index: src/node_crypto.cc
|
|
|
---- src/node_crypto.cc.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/node_crypto.cc 2016-07-22 18:06:33.152166290 +0200
|
|
|
+--- src/node_crypto.cc.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ src/node_crypto.cc 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -24,6 +24,8 @@
|
|
|
#include <stdlib.h>
|
|
|
#include <string.h>
|
|
|
@@ -173,7 +223,7 @@ Index: src/node_crypto.cc
|
|
|
#define THROW_AND_RETURN_IF_NOT_STRING_OR_BUFFER(val, prefix) \
|
|
|
do { \
|
|
|
if (!Buffer::HasInstance(val) && !val->IsString()) { \
|
|
|
-@@ -5298,7 +5300,7 @@
|
|
|
+@@ -5297,7 +5299,7 @@
|
|
|
}
|
|
|
|
|
|
raw_keylen = args[3]->NumberValue();
|
|
|
@@ -183,8 +233,8 @@ Index: src/node_crypto.cc
|
|
|
type_error = "Bad key length";
|
|
|
goto err;
|
|
|
Index: src/node_crypto.h
|
|
|
---- src/node_crypto.h.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/node_crypto.h 2016-07-22 18:06:33.152166290 +0200
|
|
|
+--- src/node_crypto.h.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ src/node_crypto.h 2016-10-13 21:19:22.949419695 +0200
|
|
|
@@ -17,20 +17,20 @@
|
|
|
|
|
|
#include "v8.h"
|
|
|
@@ -219,9 +269,9 @@ Index: src/node_crypto.h
|
|
|
#define EVP_F_EVP_DECRYPTFINAL 101
|
|
|
|
|
|
Index: src/node_internals.h
|
|
|
---- src/node_internals.h.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/node_internals.h 2016-07-22 18:06:33.152166290 +0200
|
|
|
-@@ -134,6 +134,7 @@
|
|
|
+--- src/node_internals.h.orig 2016-10-12 21:04:28.000000000 +0200
|
|
|
++++ src/node_internals.h 2016-10-13 21:19:22.949419695 +0200
|
|
|
+@@ -113,6 +113,7 @@
|
|
|
# define ROUND_UP(a, b) ((a) % (b) ? ((a) + (b)) - ((a) % (b)) : (a))
|
|
|
#endif
|
|
|
|
|
|
@@ -230,8 +280,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 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/tls_wrap.h 2016-07-22 18:06:33.152166290 +0200
|
|
|
+--- src/tls_wrap.h.orig 2016-10-12 21:04:29.000000000 +0200
|
|
|
++++ src/tls_wrap.h 2016-10-13 21:19:22.959504706 +0200
|
|
|
@@ -12,7 +12,7 @@
|
|
|
#include "util.h"
|
|
|
#include "v8.h"
|
|
|
@@ -242,9 +292,9 @@ Index: src/tls_wrap.h
|
|
|
namespace node {
|
|
|
|
|
|
Index: src/util.h
|
|
|
---- src/util.h.orig 2016-07-21 22:44:43.000000000 +0200
|
|
|
-+++ src/util.h 2016-07-22 18:06:33.152166290 +0200
|
|
|
-@@ -37,9 +37,11 @@
|
|
|
+--- src/util.h.orig 2016-10-12 21:04:29.000000000 +0200
|
|
|
++++ src/util.h 2016-10-13 21:19:22.959504706 +0200
|
|
|
+@@ -53,9 +53,11 @@
|
|
|
template <typename T> using remove_reference = std::remove_reference<T>;
|
|
|
#endif
|
|
|
|
|
|
@@ -256,7 +306,7 @@ Index: src/util.h
|
|
|
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
|
|
|
void operator=(const TypeName&) = delete; \
|
|
|
void operator=(TypeName&&) = delete; \
|
|
|
-@@ -85,12 +87,19 @@
|
|
|
+@@ -101,12 +103,19 @@
|
|
|
#define CHECK assert
|
|
|
#endif
|
|
|
|
|
|
@@ -276,7 +326,7 @@ Index: src/util.h
|
|
|
#define ASSERT_EQ(a, b) ASSERT((a) == (b))
|
|
|
#define ASSERT_GE(a, b) ASSERT((a) >= (b))
|
|
|
#define ASSERT_GT(a, b) ASSERT((a) > (b))
|
|
|
-@@ -98,13 +107,20 @@
|
|
|
+@@ -114,13 +123,20 @@
|
|
|
#define ASSERT_LT(a, b) ASSERT((a) < (b))
|
|
|
#define ASSERT_NE(a, b) ASSERT((a) != (b))
|
|
|
|
|
|
@@ -298,9 +348,9 @@ Index: src/util.h
|
|
|
|
|
|
#define ASSIGN_OR_RETURN_UNWRAP(ptr, obj, ...) \
|
|
|
Index: tools/install.py
|
|
|
---- tools/install.py.orig 2016-07-21 22:44:49.000000000 +0200
|
|
|
-+++ tools/install.py 2016-07-22 18:06:33.152166290 +0200
|
|
|
-@@ -133,10 +133,7 @@
|
|
|
+--- tools/install.py.orig 2016-10-12 21:04:36.000000000 +0200
|
|
|
++++ tools/install.py 2016-10-13 21:19:22.959504706 +0200
|
|
|
+@@ -134,10 +134,7 @@
|
|
|
|
|
|
action(['deps/v8/tools/gdbinit'], 'share/doc/node/')
|
|
|
|
|
|
@@ -312,41 +362,3 @@ Index: tools/install.py
|
|
|
|
|
|
if 'true' == variables.get('node_install_npm'): npm_files(action)
|
|
|
|
|
|
-Index: deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template
|
|
|
---- deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template.orig 2016-09-14 19:37:11.000000000 +0200
|
|
|
-+++ deps/v8_inspector/third_party/v8_inspector/platform/inspector_protocol/String16_cpp.template 2016-09-16 20:33:15.909387208 +0200
|
|
|
-@@ -4,6 +4,7 @@
|
|
|
-
|
|
|
- #include <cstdlib>
|
|
|
- #include <cstring>
|
|
|
-+#include <cstdio>
|
|
|
- #include <string>
|
|
|
-
|
|
|
- namespace blink {
|
|
|
-@@ -13,22 +14,22 @@
|
|
|
-
|
|
|
- void intToStr(int number, char* buffer, size_t length)
|
|
|
- {
|
|
|
-- std::snprintf(buffer, length, "%d", number);
|
|
|
-+ snprintf(buffer, length, "%d", number);
|
|
|
- }
|
|
|
-
|
|
|
- void doubleToStr(double number, char* buffer, size_t length)
|
|
|
- {
|
|
|
-- std::snprintf(buffer, length, "%f", number);
|
|
|
-+ snprintf(buffer, length, "%f", number);
|
|
|
- }
|
|
|
-
|
|
|
- void doubleToStr3(double number, char* buffer, size_t length)
|
|
|
- {
|
|
|
-- std::snprintf(buffer, length, "%.3g", number);
|
|
|
-+ snprintf(buffer, length, "%.3g", number);
|
|
|
- }
|
|
|
-
|
|
|
- void doubleToStr6(double number, char* buffer, size_t length)
|
|
|
- {
|
|
|
-- std::snprintf(buffer, length, "%.6g", number);
|
|
|
-+ snprintf(buffer, length, "%.6g", number);
|
|
|
- }
|
|
|
-
|
|
|
- double strToDouble(const char* buffer, bool* ok)
|