From 3460885116c7df9c7ba03065807eafaf72542044 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Thu, 5 Mar 2020 17:43:09 +0100 Subject: [PATCH] upgrading package: node 12.16.1 -> 13.10.1 --- node/node.patch | 127 ++++++++++++++++++------------------------------ node/node.spec | 10 ++-- 2 files changed, 51 insertions(+), 86 deletions(-) diff --git a/node/node.patch b/node/node.patch index b83ef2d5b8..99767aaeb4 100644 --- a/node/node.patch +++ b/node/node.patch @@ -1,7 +1,7 @@ Index: common.gypi ---- common.gypi.orig 2020-02-11 16:18:16.000000000 +0100 -+++ common.gypi 2020-02-11 22:42:06.666241000 +0100 -@@ -195,7 +195,7 @@ +--- common.gypi.orig 2019-12-17 08:41:00.000000000 +0100 ++++ common.gypi 2019-12-18 11:39:16.750644000 +0100 +@@ -161,7 +161,7 @@ }], ], }, @@ -10,16 +10,16 @@ Index: common.gypi 'conditions': [ ['OS=="solaris"', { # pull in V8's postmortem metadata -@@ -359,7 +359,7 @@ +@@ -331,7 +331,7 @@ 'ldflags': [ '-pthread' ], }], [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { - 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], + 'cflags': [ '-Wno-unused-parameter', ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++1y' ], - 'defines': [ '__STDC_FORMAT_MACROS' ], 'ldflags': [ '-rdynamic' ], -@@ -458,10 +458,7 @@ + 'target_conditions': [ +@@ -429,10 +429,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 2020-02-11 16:18:18.000000000 +0100 -+++ deps/uv/common.gypi 2020-02-11 22:42:06.666408000 +0100 +--- deps/uv/common.gypi.orig 2019-12-17 08:41:01.000000000 +0100 ++++ deps/uv/common.gypi 2019-12-18 11:39:16.750940000 +0100 @@ -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 2020-02-11 16:18:18.000000000 +0100 -+++ deps/uv/uv.gyp 2020-02-11 22:42:06.666567000 +0100 +--- deps/uv/uv.gyp.orig 2019-12-17 08:41:01.000000000 +0100 ++++ deps/uv/uv.gyp 2019-12-18 11:39:16.751225000 +0100 @@ -178,7 +178,7 @@ 'src/unix/udp.c', ], @@ -56,9 +56,9 @@ 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 2020-02-11 16:18:18.000000000 +0100 -+++ deps/v8/src/base/platform/platform-freebsd.cc 2020-02-11 22:42:06.666704000 +0100 -@@ -27,6 +27,7 @@ +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2019-12-17 08:41:01.000000000 +0100 ++++ deps/v8/src/base/platform/platform-freebsd.cc 2019-12-18 11:39:16.751481000 +0100 +@@ -25,6 +25,7 @@ #include // index #include @@ -67,9 +67,9 @@ Index: deps/v8/src/base/platform/platform-freebsd.cc #undef MAP_TYPE Index: deps/v8/src/builtins/base.tq ---- deps/v8/src/builtins/base.tq.orig 2020-02-11 16:18:18.000000000 +0100 -+++ deps/v8/src/builtins/base.tq 2020-02-11 22:42:06.667354000 +0100 -@@ -477,9 +477,6 @@ +--- deps/v8/src/builtins/base.tq.orig 2019-12-17 08:41:01.000000000 +0100 ++++ deps/v8/src/builtins/base.tq 2019-12-18 11:39:16.752357000 +0100 +@@ -546,9 +546,6 @@ } extern class JSArray extends JSObject { @@ -79,7 +79,7 @@ Index: deps/v8/src/builtins/base.tq length: Number; } -@@ -493,15 +490,6 @@ +@@ -562,15 +559,6 @@ }; } @@ -95,7 +95,7 @@ Index: deps/v8/src/builtins/base.tq // A HeapObject with a JSArray map, and either fast packed elements, or fast // holey elements when the global NoElementsProtector is not invalidated. transient type FastJSArray extends JSArray; -@@ -2969,10 +2957,6 @@ +@@ -3178,10 +3166,6 @@ return UnsafeCast( LoadNativeContext(context)[JS_ARRAY_PACKED_ELEMENTS_MAP_INDEX]); } @@ -106,7 +106,7 @@ Index: deps/v8/src/builtins/base.tq macro GetProxyRevocableResultMap(implicit context: Context)(): Map { return UnsafeCast( LoadNativeContext(context)[PROXY_REVOCABLE_RESULT_MAP_INDEX]); -@@ -3508,11 +3492,6 @@ +@@ -3719,11 +3703,6 @@ unreachable; } @@ -119,8 +119,8 @@ Index: deps/v8/src/builtins/base.tq if (value == V8_INFINITY) { return true; Index: deps/v8/src/wasm/wasm-result.cc ---- deps/v8/src/wasm/wasm-result.cc.orig 2020-02-11 16:18:19.000000000 +0100 -+++ deps/v8/src/wasm/wasm-result.cc 2020-02-11 22:42:06.667477000 +0100 +--- deps/v8/src/wasm/wasm-result.cc.orig 2019-12-17 08:41:02.000000000 +0100 ++++ deps/v8/src/wasm/wasm-result.cc 2019-12-18 11:39:16.752617000 +0100 @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -131,8 +131,8 @@ Index: deps/v8/src/wasm/wasm-result.cc #include "src/execution/isolate-inl.h" Index: lib/dns.js ---- lib/dns.js.orig 2020-02-11 16:18:20.000000000 +0100 -+++ lib/dns.js 2020-02-11 22:42:06.667607000 +0100 +--- lib/dns.js.orig 2019-12-17 08:41:03.000000000 +0100 ++++ lib/dns.js 2019-12-18 11:39:16.752882000 +0100 @@ -146,6 +146,10 @@ req.hostname = hostname; req.oncomplete = all ? onlookupall : onlookup; @@ -145,9 +145,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 2020-02-11 16:18:20.000000000 +0100 -+++ lib/internal/modules/cjs/loader.js 2020-02-11 22:42:06.667826000 +0100 -@@ -1259,7 +1259,10 @@ +--- lib/internal/modules/cjs/loader.js.orig 2019-12-17 08:41:03.000000000 +0100 ++++ lib/internal/modules/cjs/loader.js 2019-12-18 11:39:16.753323000 +0100 +@@ -1246,7 +1246,10 @@ path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); @@ -159,20 +159,9 @@ Index: lib/internal/modules/cjs/loader.js if (homeDir) { paths.unshift(path.resolve(homeDir, '.node_libraries')); -Index: src/inspector/node_string.h ---- src/inspector/node_string.h.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/inspector/node_string.h 2020-02-11 22:42:06.667949000 +0100 -@@ -3,6 +3,7 @@ - #ifndef SRC_INSPECTOR_NODE_STRING_H_ - #define SRC_INSPECTOR_NODE_STRING_H_ - -+#include "env.h" - #include "util.h" - #include "v8-inspector.h" - Index: src/inspector_socket_server.cc ---- src/inspector_socket_server.cc.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/inspector_socket_server.cc 2020-02-11 22:42:06.668099000 +0100 +--- src/inspector_socket_server.cc.orig 2019-12-17 08:41:03.000000000 +0100 ++++ src/inspector_socket_server.cc 2019-12-18 11:39:16.753627000 +0100 @@ -20,7 +20,7 @@ bool include_protocol); namespace { @@ -183,8 +172,8 @@ Index: src/inspector_socket_server.cc }; Index: src/node_constants.cc ---- src/node_constants.cc.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/node_constants.cc 2020-02-11 22:42:06.668295000 +0100 +--- src/node_constants.cc.orig 2019-12-17 08:41:03.000000000 +0100 ++++ src/node_constants.cc 2019-12-18 11:39:16.753984000 +0100 @@ -36,10 +36,10 @@ @@ -200,8 +189,8 @@ Index: src/node_constants.cc #endif // HAVE_OPENSSL Index: src/node_crypto.cc ---- src/node_crypto.cc.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/node_crypto.cc 2020-02-11 22:42:06.669048000 +0100 +--- src/node_crypto.cc.orig 2019-12-17 08:41:03.000000000 +0100 ++++ src/node_crypto.cc 2019-12-18 11:39:16.755323000 +0100 @@ -38,17 +38,17 @@ #include "util-inl.h" #include "v8.h" @@ -230,9 +219,9 @@ Index: src/node_crypto.cc #include #include // INT_MAX Index: src/node_crypto.h ---- src/node_crypto.h.orig 2020-02-11 22:42:06.669274000 +0100 -+++ src/node_crypto.h 2020-02-11 22:47:55.771975000 +0100 -@@ -33,12 +33,13 @@ +--- src/node_crypto.h.orig 2019-12-18 11:39:16.755853000 +0100 ++++ src/node_crypto.h 2019-12-18 11:44:58.717742000 +0100 +@@ -33,12 +33,12 @@ #include "v8.h" @@ -244,7 +233,6 @@ Index: src/node_crypto.h -#include +#include "openssl/err.h" +#include "openssl/ssl.h" -+#include "openssl/evp.h" +#include "openssl/bn.h" +#include "openssl/dh.h" +#include "openssl/ec.h" @@ -252,21 +240,9 @@ Index: src/node_crypto.h namespace node { namespace crypto { -Index: src/node_metadata.cc ---- src/node_metadata.cc.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/node_metadata.cc 2020-02-11 22:42:06.669460000 +0100 -@@ -9,7 +9,7 @@ - #include "zlib.h" - - #if HAVE_OPENSSL --#include -+#include "openssl/opensslv.h" - #endif // HAVE_OPENSSL - - #ifdef NODE_HAVE_I18N_SUPPORT Index: src/tls_wrap.h ---- src/tls_wrap.h.orig 2020-02-11 16:18:20.000000000 +0100 -+++ src/tls_wrap.h 2020-02-11 22:42:06.669581000 +0100 +--- src/tls_wrap.h.orig 2019-12-17 08:41:03.000000000 +0100 ++++ src/tls_wrap.h 2019-12-18 11:39:16.756335000 +0100 @@ -30,7 +30,7 @@ #include "stream_wrap.h" #include "v8.h" @@ -276,20 +252,9 @@ Index: src/tls_wrap.h #include -Index: src/tracing/traced_value.cc ---- src/tracing/traced_value.cc.orig 2020-02-11 16:18:21.000000000 +0100 -+++ src/tracing/traced_value.cc 2020-02-11 22:42:06.669714000 +0100 -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - #include "tracing/traced_value.h" -+#include "base_object.h" - - #if defined(NODE_HAVE_I18N_SUPPORT) - #include Index: src/util.h ---- src/util.h.orig 2020-02-11 16:18:21.000000000 +0100 -+++ src/util.h 2020-02-11 22:42:06.669874000 +0100 +--- src/util.h.orig 2019-12-17 08:41:03.000000000 +0100 ++++ src/util.h 2019-12-18 11:39:16.756670000 +0100 @@ -152,14 +152,23 @@ } \ } while (0) @@ -323,8 +288,8 @@ Index: src/util.h ERROR_AND_ABORT("Unreachable code reached" __VA_OPT__(": ") __VA_ARGS__) Index: tools/install.py ---- tools/install.py.orig 2020-02-11 16:18:21.000000000 +0100 -+++ tools/install.py 2020-02-11 22:42:06.670000000 +0100 +--- tools/install.py.orig 2019-12-17 08:41:04.000000000 +0100 ++++ tools/install.py 2019-12-18 11:39:16.756922000 +0100 @@ -151,10 +151,7 @@ action(['deps/v8/tools/gdbinit'], 'share/doc/node/') action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/') @@ -338,8 +303,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 2020-02-11 16:18:22.000000000 +0100 -+++ tools/v8_gypfiles/toolchain.gypi 2020-02-11 22:42:06.670218000 +0100 +--- tools/v8_gypfiles/toolchain.gypi.orig 2019-12-17 08:41:04.000000000 +0100 ++++ tools/v8_gypfiles/toolchain.gypi 2019-12-18 11:39:16.757410000 +0100 @@ -1123,12 +1123,6 @@ ['OS=="solaris"', { 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. @@ -376,9 +341,9 @@ Index: tools/v8_gypfiles/toolchain.gypi 'cflags': ['-O2'], 'cflags!': ['-O3'], Index: tools/v8_gypfiles/v8.gyp ---- tools/v8_gypfiles/v8.gyp.orig 2020-02-11 16:18:22.000000000 +0100 -+++ tools/v8_gypfiles/v8.gyp 2020-02-11 22:42:06.670435000 +0100 -@@ -86,8 +86,7 @@ +--- tools/v8_gypfiles/v8.gyp.orig 2019-12-17 08:41:04.000000000 +0100 ++++ tools/v8_gypfiles/v8.gyp 2019-12-18 11:39:16.757845000 +0100 +@@ -90,8 +90,7 @@ "<(V8_ROOT)/src/builtins/typed-array-some.tq", "<(V8_ROOT)/src/builtins/typed-array-subarray.tq", "<(V8_ROOT)/src/builtins/typed-array.tq", diff --git a/node/node.spec b/node/node.spec index 1a72c5fbf9..aec56003c9 100644 --- a/node/node.spec +++ b/node/node.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 12.16.1 -%define V_dist 12.16.1 +%define V_opkg 13.10.1 +%define V_dist 13.10.1 # package information Name: node @@ -36,7 +36,7 @@ Class: PLUS Group: Web License: MIT/BSD Version: %{V_opkg} -Release: 20200219 +Release: 20200305 # package options %option with_icu yes @@ -59,13 +59,13 @@ PreReq: icu %description Node.js provides an easy way to build scalable network servers in JavaScript. It is an event-driven I/O environment based - on Google V8 JavaScript virtual machine version 7.7.299.13. + on Google V8 JavaScript virtual machine version 7.9.317.25. %track prog node = { version = %{V_dist} url = https://nodejs.org/download/release/ - regex = v(12\.\d+\.\d+)/ + regex = v(\d+\.\d+\.\d+)/ } %prep