Hello community, here is the log from the commit of package nodejs6 for openSUSE:Factory checked in at 2018-05-24 23:24:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs6 (Old) and /work/SRC/openSUSE:Factory/.nodejs6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs6" Thu May 24 23:24:31 2018 rev:25 rq:610028 version:6.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs6/nodejs6.changes 2018-04-05 15:35:12.288427510 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs6.new/nodejs6.changes 2018-05-24 23:24:34.258018427 +0200 @@ -1,0 +2,13 @@ +Fri May 11 12:36:46 UTC 2018 - [email protected] + +- New upstream LTS release 6.14.2: + * n-api: n-api has been backported to v6.x. +- icu_61_namespacefix.patch: Fix building with ICU61.1 (bsc#1091764) +- versioned.patch: rebased + +------------------------------------------------------------------- +Thu Apr 5 07:18:42 UTC 2018 - [email protected] + +- Install license with %license, not %doc (bsc#1082318) + +------------------------------------------------------------------- Old: ---- node-v6.14.1.tar.xz New: ---- icu_61_namespacefix.patch node-v6.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs6.spec ++++++ --- /var/tmp/diff_new_pack.mRkUs7/_old 2018-05-24 23:24:35.117987131 +0200 +++ /var/tmp/diff_new_pack.mRkUs7/_new 2018-05-24 23:24:35.121986986 +0200 @@ -26,11 +26,17 @@ ########################################################### Name: nodejs6 -Version: 6.14.1 +Version: 6.14.2 Release: 0 %define node_version_number 6 +%if %node_version_number >= 10 +%define openssl_req_ver 1.1.0 +%else # node8 or older +%define openssl_req_ver 1.0.2 +%endif + %if 0%{?suse_version} == 1110 %define _libexecdir %{_exec_prefix}/lib %endif @@ -97,6 +103,7 @@ ## UPSTREAM PATCHES HERE, if any Patch3: fix_ci_tests.patch +Patch6: icu_61_namespacefix.patch ## Our patches # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -177,13 +184,13 @@ %if ! %{with intree_openssl} %if %node_version_number >= 8 -BuildRequires: openssl-devel >= 1.0.2 +BuildRequires: openssl-devel >= %{openssl_req_ver} %else # older node doesn't support OpenSSL 1.1 %if 0%{?suse_version} >= 1330 BuildRequires: libopenssl-1_0_0-devel %else -BuildRequires: openssl-devel >= 1.0.2 +BuildRequires: openssl-devel >= %{openssl_req_ver} %endif %endif # older node doesn't support OpenSSL 1.1 @@ -277,6 +284,7 @@ %patch3 -p1 %if ! %{with intree_openssl} %endif +%patch6 -p1 %patch101 -p1 %patch102 -p1 # Add check_output to configure script (not part of Python 2.6 in SLE11). @@ -419,6 +427,11 @@ ln -s %{_sysconfdir}/alternatives/npx.1%{ext_man} %{buildroot}%{_mandir}/man1/npx.1%{ext_man} %endif +# We need to own directory on old versions of SLE +%if 0%{?suse_version} < 1500 +mkdir -p %{buildroot}%{_defaultlicensedir} +%endif + %check ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi # Tarball doesn't have eslint package distributed, so disable some tests @@ -435,7 +448,8 @@ %files %defattr(-, root, root) -%doc AUTHORS LICENSE *.md +%license LICENSE +%doc AUTHORS *.md %doc deps/v8/tools/gdbinit %dir %{_libdir}/node_modules %{_bindir}/node%{node_version_number} @@ -445,6 +459,10 @@ %ghost %{_sysconfdir}/alternatives/node-default %ghost %{_sysconfdir}/alternatives/node.1%{ext_man} %exclude %{_libdir}/node_modules/npm%{node_version_number} +# We need to own directory on old versions of SLE +%if 0%{?suse_version} < 1500 +%dir %{_defaultlicensedir} +%endif %files -n npm%{node_version_number} %defattr(-, root, root) ++++++ SHASUMS256.txt ++++++ --- /var/tmp/diff_new_pack.mRkUs7/_old 2018-05-24 23:24:35.161985530 +0200 +++ /var/tmp/diff_new_pack.mRkUs7/_new 2018-05-24 23:24:35.161985530 +0200 @@ -1,42 +1,42 @@ -baff3cbf6ad4f386d47aa2fd8c87c9947aea6654578008fc082d3812e9e6f4d3 node-v6.14.1-aix-ppc64.tar.gz -b561f7a9ff3975b30b8788b0b3830a241a5373fe8e7f52201af92e2d1a4b0a0e node-v6.14.1-darwin-x64.tar.gz -0a5e12f4c12039e0b5b05fd92edffc46d52a4edb0cf553ccd59c49e3a146d175 node-v6.14.1-darwin-x64.tar.xz -1e1519e4797b59799293b867aaccb23376d08baba0dda3cd09cf966f6f037dd4 node-v6.14.1-headers.tar.gz -a4400dbe159f5464c9e900143c7b336dc1e66726b462329a4ea4f3513feb37ba node-v6.14.1-headers.tar.xz -8f73b9a9a9816cc2b7f3b18947da0d644c6ea2c74c0e95101814e4e951a4f270 node-v6.14.1-linux-arm64.tar.gz -d262b6bee47798c0037d1785cbbf1055a4e167e0965396dc6f3f55486567e44c node-v6.14.1-linux-arm64.tar.xz -bcef7dcbce3e349eafefc7dcebddee1f085e85d26707a72752907a1c9535b71d node-v6.14.1-linux-armv6l.tar.gz -575810fcfecfe6315571710bddc0a2bc41e52d501f42e3f993ddab2e324dbee0 node-v6.14.1-linux-armv6l.tar.xz -575b75eb9ce7afa660b8e8bd3abfb8d1cb8401ad402fed8ce5eeeb85ac76a3d3 node-v6.14.1-linux-armv7l.tar.gz -68cfed242cdad765248964f42120c9d272bc95106c8de5b546ce2258e5cd2a0b node-v6.14.1-linux-armv7l.tar.xz -9b921422b7a7ac4737e2ab0af72b1be3be7633ea2c977e98c8c6572a05521c63 node-v6.14.1-linux-ppc64le.tar.gz -3ec94786d7645b33e059de208c6d3151c07e9d6cf8fc44744228648a1e3fa1ab node-v6.14.1-linux-ppc64le.tar.xz -7a89f4f709f2c6dc633cf817b49996d0daa9ebd774eb58c896f128727c04e33a node-v6.14.1-linux-ppc64.tar.gz -27fd1c7ea38b20b86e8aa5cfb71a9854b22180d6f5d1a1f3e39f7355ac71b0cf node-v6.14.1-linux-ppc64.tar.xz -db2fb4dce6e8cdf6aef695ee77efb5d0b4eaad9de931302a4ef3db1fc3606ae9 node-v6.14.1-linux-s390x.tar.gz -91138e82eace207c871f52a08e0114210e52710daebb4f0158c4d34f9e7091c4 node-v6.14.1-linux-s390x.tar.xz -f3d943fc6b16d86827bbe74e4fe243c2a9414f4bd04d9273aed58bb55f0906c8 node-v6.14.1-linux-x64.tar.gz -bdd6b8e33a6f54383ca14c15c05dbe76af7866e9fabf3c88f1cfea8d1b97286e node-v6.14.1-linux-x64.tar.xz -d46d38b9c128a468bb6a49dde1d7cdfff5c4ffd2b33976077432e42b3adccf66 node-v6.14.1-linux-x86.tar.gz -4bc4e5a533c74484ce4340c76ec5fe079443341920b6c2cd5312e0a0d90203f3 node-v6.14.1-linux-x86.tar.xz -7b2544789ea5cef75ce372d6cc902994d99f3b5c469b8242e544bc025eb707dd node-v6.14.1.pkg -8b5bc5d4ad2522c39b9b84ffada91e30e97d13b5ddf348399fb70239e299527a node-v6.14.1-sunos-x64.tar.gz -9db17f95a23ddad69742c80997964dd3590554ae35515267aaa88ad9e1e12e49 node-v6.14.1-sunos-x64.tar.xz -f5fe01c0b40b46a86cb4aa794b2b84cded32f3681ebd4a901818fe383fc4cc6c node-v6.14.1-sunos-x86.tar.gz -ff1701e7b683bc8e4f8e786ac35cb147f33566bed7d4cec5f4680ad0df5f5197 node-v6.14.1-sunos-x86.tar.xz -82ca9917819db13c3a3484bd2bee1c58cd718aec3e4ad46026f968557a6717be node-v6.14.1.tar.gz -115eda89ff718abe811cb14c31dec891efa20b92c99e715f5e094641bc56bec3 node-v6.14.1.tar.xz -5b1f61841e5a75f18b6b737898dd60866f4301015fe9fdf7ef8ada007b79a3bf node-v6.14.1-win-x64.7z -c48646942f676b4c9437afe36dd9d7c9922d1c1c3e5b17a4ec2cc180d9317215 node-v6.14.1-win-x64.zip -77a93b6c4cd7b5bb09cf4ea5448e3a4ce08c7a3624331f944acd496dc435ad2b node-v6.14.1-win-x86.7z -159e682b1146972542a36114517b32595c5a1818d8d76ade0de8e8615446bf9b node-v6.14.1-win-x86.zip -582b6c13faf75df3ff353504710f92855d2848dc2391a229d2b4f59ea1eee566 node-v6.14.1-x64.msi -9b7c18106cf2a5f517d705bc076641445bf39e84209240665ba9a02637d3b277 node-v6.14.1-x86.msi -e9e1435ed00330cc025ee10047c489b71f0ab68fc5e7d3f1aefd60d317257eb5 win-x64/node.exe -1882dcdd4a874322d2e69b2dd4143a453a2d99e36ce113ab0003cb5590d4bb00 win-x64/node.lib -21c8dfc25dd961fd337a4c92d52f4baa08689d38e87d04fa01424f3b466885e8 win-x64/node_pdb.7z -0be205d808e960c1d3e4aa1e80b5d07de80736d152e2a1997b53f4342c59b7fd win-x64/node_pdb.zip -cc8ef5229558cc712f943225cd5fe4023acb897dd56b87a48f98f1017d99d0ef win-x86/node.exe -ed78a7b496aa654df8a935fae4f6ec247165676cd82a4e5c82f16956cc4ff258 win-x86/node.lib -3f547401f1757db2afb9cd585bc08eba389e733df0bb5f2a024eea0f054cd91f win-x86/node_pdb.7z -d8a1193ff939ffccdaabec4817c89c23e20da8fd4e0e1acba6b70afa1096480e win-x86/node_pdb.zip +dcad7d29c35ff34b54dc5c0c80c90626d1b85039147b11635d91203aa2411d91 node-v6.14.2-aix-ppc64.tar.gz +3a9df48bacb73b7be328e180a12f9a3fe5c75bd95a77f2921abfcda00c466afd node-v6.14.2-darwin-x64.tar.gz +da9f1b184a9b5888d7f66741b65cf37069a01b292ac0b1bca7211c617c2da39f node-v6.14.2-darwin-x64.tar.xz +8430d90456ac48d30edf69f0474006e3f5b3c532870ad33f9b267492bda2aff1 node-v6.14.2-headers.tar.gz +ef9f32791bf5da23ec22a99d1b2edf3182f1acc7f57b8916626344050416f4f4 node-v6.14.2-headers.tar.xz +0208689114ad9cd52b02abc2edda2d36df74fb963e07a0ad05d5d54aaeae9cd3 node-v6.14.2-linux-arm64.tar.gz +c08e2c2c84839637000f06cf2dbb5ae027b1f0bf4e6ee01947a36d3e0132cd1f node-v6.14.2-linux-arm64.tar.xz +648e1b06a4e5e30b7b48d5f805470421c2449cceac586c4c127a01a5014c2f30 node-v6.14.2-linux-armv6l.tar.gz +c7d522e9085359e51cbb565cad9676cdab77bfa1c6e377382b5848d2c667e498 node-v6.14.2-linux-armv6l.tar.xz +f51c29ef8125f52aa68db38517c9f48e0bc3607db1e8c5c282a77b7571634fed node-v6.14.2-linux-armv7l.tar.gz +36ff030127c606a7feeddb17c369a411f46f06b1e0be4d6a8945323eb538fdb5 node-v6.14.2-linux-armv7l.tar.xz +79c345bf0899e648a54b036812a7f0ded303ceea3fc91fff75053e4969aa49ff node-v6.14.2-linux-ppc64le.tar.gz +00cab79a939b48799551f813eea77e395529f1c741a6c6e41a2439c6e75fc472 node-v6.14.2-linux-ppc64le.tar.xz +66224eca10b36e30708bba7e28dfd2b9a39c33bbb8b39a7acd2e46f306611873 node-v6.14.2-linux-ppc64.tar.gz +9256e8c288e1d9a6884a4bf726276872b2876271a32e7b6c5a061dea415fda4d node-v6.14.2-linux-ppc64.tar.xz +fe769c213e79378127272898f5e69fa41e9b91985a33093480f3cb0fc9237bf0 node-v6.14.2-linux-s390x.tar.gz +1c87e96b3d1e9b166a35f98bcc211968f61952698884ad562135d535c10cc688 node-v6.14.2-linux-s390x.tar.xz +d96b8e43d035890dfd2145a71a95edc2b3ed58e56c5134666bd6a7e5f841d4c3 node-v6.14.2-linux-x64.tar.gz +8c5005f8fd55ddbff35122dbe69bd5f50beea56038c2812dc9610dad19086c28 node-v6.14.2-linux-x64.tar.xz +89541c09865bcc0fa026dbce5093d553abd0f9f903d9a9d07b1a4ccfb6a88782 node-v6.14.2-linux-x86.tar.gz +997e7b77155d6bc07a9a39f03cd0c046206ee9140d98b72101105ce0cba76615 node-v6.14.2-linux-x86.tar.xz +e65ea1fc39bb1fa73a6a18b8fa46435eed4a3038822eaa4aaa40d2983d205dda node-v6.14.2.pkg +0587b7bf0bc2a9a55c71c22f49bd66d8b0cc2d92eb2065158e8b9f921a6fcaeb node-v6.14.2-sunos-x64.tar.gz +d41403e51cfc2b2eb289a088e6cd01588c1b26987d4ebaaa078e64c52fbc5d4d node-v6.14.2-sunos-x64.tar.xz +3942d9a8ebe15326a4831edab7dfd5bf33d7fbbafb27d0fea7c518a23a91f416 node-v6.14.2-sunos-x86.tar.gz +5434fd9dd7c0bc5ee5352932ec04d61265387719fbd5dd61556f5a183584b9dd node-v6.14.2-sunos-x86.tar.xz +418901524257a2750930d659b3b9f8b8bb0b166974ab2103192270f80bd5f677 node-v6.14.2.tar.gz +b3a534b2ad5e96c6ff67f3a1356b94f7a28ef118eb1d420b314fe5aafe6d62d1 node-v6.14.2.tar.xz +3c450687bae508c3ad82f6663be63dc2a7320836655a03c3653df734c6c0c143 node-v6.14.2-win-x64.7z +c94809dbdb09b4ce6d285044f3674343b82535877a8a1c190fabbb506fe0d372 node-v6.14.2-win-x64.zip +471eb35bc855e5b942d059effe8f967f1f2c7a4d6e0b04542b68c6463cce0e13 node-v6.14.2-win-x86.7z +4f0119da5262a5f8a9f76413be58a26d07a954ac865f6520f98ad32461f03eca node-v6.14.2-win-x86.zip +b8469f009e003acc9e022392be5a0b3e8cdc4215ba1da583275e6bb9f12cd4aa node-v6.14.2-x64.msi +265adddc325a7d4329caa4dce1e3dfe2087107d011eb764c42563c6ee877aef6 node-v6.14.2-x86.msi +d43cd08f058cb13735d5c420c9ff5b17bb69b500b8caa25a6d8031321db05562 win-x64/node.exe +8ff4e08afa3865beae578daf8f10631989fb0945d95797b0324353930f0d9d75 win-x64/node.lib +0f8e3c1c18d85f86354752938e195b6bf4a4e9a8e1c31a2075535f319cda8300 win-x64/node_pdb.7z +28033a00eb75a3257b558a607e390d8ad5542185bac27a9efe7c939b6e36a89a win-x64/node_pdb.zip +bd6a383ffe34dc65de5f1a01b62468ef7806747eb11511dc9b2fd8005639ddc0 win-x86/node.exe +d4a97a5f98fb9ecbe45a33f54c49dccde4a7d6fa4382bfc6b952ca240c26d925 win-x86/node.lib +5b10c144e97e7398db42f57b2c08241cd2f93f61a2429b642ed4c74de73fa359 win-x86/node_pdb.7z +866cb7ffdff8c8eb6c317569bb9b3ebce09dec5de5c2053e3210e12ffb4ccaf7 win-x86/node_pdb.zip ++++++ SHASUMS256.txt.sig ++++++ Binary files /var/tmp/diff_new_pack.mRkUs7/_old and /var/tmp/diff_new_pack.mRkUs7/_new differ ++++++ icu_61_namespacefix.patch ++++++ Base on, commit d190c9a41e3b4a3121af5ed9ac759c3d5a277ee1 Author: Steven R. Loomis <[email protected]> Date: Wed Feb 7 16:42:21 2018 -0800 src: add "icu::" prefix before ICU symbols In ICU 61.x, icu4c will no longer put its declarations in the global namespace. Everything will be in the "icu::" namespace (or icu_60:: in the linker). Prepare for this. https://ssl.icu-project.org/trac/ticket/13460 Index: node-v6.14.1/tools/icu/iculslocs.cc =================================================================== --- node-v6.14.1.orig/tools/icu/iculslocs.cc +++ node-v6.14.1/tools/icu/iculslocs.cc @@ -65,7 +65,7 @@ int VERBOSE = 0; #define RES_INDEX "res_index" #define INSTALLEDLOCALES "InstalledLocales" -CharString packageName; +icu::CharString packageName; const char* locale = RES_INDEX; // locale referring to our index void usage() { @@ -148,7 +148,7 @@ int localeExists(const char* loc, UBool* if (VERBOSE > 1) { u_printf("Trying to open %s:%s\n", packageName.data(), loc); } - LocalUResourceBundlePointer aResource( + icu::LocalUResourceBundlePointer aResource( ures_openDirect(packageName.data(), loc, &status)); *exists = FALSE; if (U_SUCCESS(status)) { @@ -190,11 +190,11 @@ void printIndent(const LocalUFILEPointer * @return 0 for OK, 1 for err */ int dumpAllButInstalledLocales(int lev, - LocalUResourceBundlePointer* bund, + icu::LocalUResourceBundlePointer* bund, LocalUFILEPointer* bf, UErrorCode* status) { ures_resetIterator(bund->getAlias()); - LocalUResourceBundlePointer t; + icu::LocalUResourceBundlePointer t; while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) { t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status)); ASSERT_SUCCESS(status, "while processing table"); @@ -256,10 +256,10 @@ int list(const char* toBundle) { u_printf("\"locale\": %s\n", locale); } - LocalUResourceBundlePointer bund( + icu::LocalUResourceBundlePointer bund( ures_openDirect(packageName.data(), locale, &status)); ASSERT_SUCCESS(&status, "while opening the bundle"); - LocalUResourceBundlePointer installedLocales( + icu::LocalUResourceBundlePointer installedLocales( ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status)); ASSERT_SUCCESS(&status, "while fetching installed locales"); @@ -295,7 +295,7 @@ int list(const char* toBundle) { } // OK, now list them. - LocalUResourceBundlePointer subkey; + icu::LocalUResourceBundlePointer subkey; int validCount = 0; for (int32_t i = 0; i < count; i++) { ++++++ node-v6.14.1.tar.xz -> node-v6.14.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs6/node-v6.14.1.tar.xz /work/SRC/openSUSE:Factory/.nodejs6.new/node-v6.14.2.tar.xz differ: char 26, line 1 ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.mRkUs7/_old 2018-05-24 23:24:35.225983201 +0200 +++ /var/tmp/diff_new_pack.mRkUs7/_new 2018-05-24 23:24:35.225983201 +0200 @@ -8,65 +8,25 @@ This is also important for generation of binary modules for multiple versions of NodeJS -Index: node-v6.12.2/node.gyp +Index: node-v6.14.2/node.gyp =================================================================== ---- node-v6.12.2.orig/node.gyp -+++ node-v6.12.2/node.gyp -@@ -19,7 +19,7 @@ +--- node-v6.14.2.orig/node.gyp ++++ node-v6.14.2/node.gyp +@@ -20,8 +20,8 @@ 'node_shared_openssl%': 'false', 'node_v8_options%': '', 'node_enable_v8_vtunejit%': 'false', - 'node_core_target_name%': 'node', +- 'node_lib_target_name%': 'node_lib', + 'node_core_target_name%': 'node6', ++ 'node_lib_target_name%': 'node6_lib', + 'node_intermediate_lib_type%': 'static_library', 'library_files': [ 'lib/internal/bootstrap_node.js', - 'lib/_debug_agent.js', -@@ -437,10 +437,10 @@ - { - 'action_name': 'node_dtrace_provider_o', - 'inputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace.o', -+ '<(OBJ_DIR)/node6/src/node_dtrace.o', - ], - 'outputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace_provider.o' -+ '<(OBJ_DIR)/node6/src/node_dtrace_provider.o' - ], - 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d', - '<@(_inputs)', '-o', '<@(_outputs)' ] -@@ -490,7 +490,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/v8constants.h' - ], - 'outputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace_ustack.o' -+ '<(OBJ_DIR)/node6/src/node_dtrace_ustack.o' - ], - 'conditions': [ - [ 'target_arch=="ia32" or target_arch=="arm"', { -@@ -551,8 +551,8 @@ - ], - - 'variables': { -- 'OBJ_PATH': '<(OBJ_DIR)/node/src', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen', -+ 'OBJ_PATH': '<(OBJ_DIR)/node6/src', -+ 'OBJ_GEN_PATH': '<(OBJ_DIR)/node6/gen', - 'OBJ_SUFFIX': 'o', - 'conditions': [ - ['OS=="win"', { -@@ -660,7 +660,7 @@ - ['OS=="aix"', { - 'targets': [ - { -- 'target_name': 'node', -+ 'target_name': 'node6', - 'conditions': [ - ['node_shared=="true"', { - 'type': 'shared_library', -Index: node-v6.12.2/Makefile +Index: node-v6.14.2/Makefile =================================================================== ---- node-v6.12.2.orig/Makefile -+++ node-v6.12.2/Makefile +--- node-v6.14.2.orig/Makefile ++++ node-v6.14.2/Makefile @@ -37,10 +37,10 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -80,10 +40,10 @@ # Flags for packaging. BUILD_DOWNLOAD_FLAGS ?= --download=all -Index: node-v6.12.2/tools/install.py +Index: node-v6.14.2/tools/install.py =================================================================== ---- node-v6.12.2.orig/tools/install.py -+++ node-v6.12.2/tools/install.py +--- node-v6.14.2.orig/tools/install.py ++++ node-v6.14.2/tools/install.py @@ -78,7 +78,7 @@ def install(paths, dst): map(lambda path def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths) @@ -135,7 +95,7 @@ if 'true' == variables.get('node_install_npm'): npm_files(action) -@@ -158,31 +158,31 @@ def headers(action): +@@ -160,31 +160,31 @@ def headers(action): 'src/node_buffer.h', 'src/node_object_wrap.h', 'src/node_version.h', @@ -176,10 +136,10 @@ def run(args): global node_prefix, install_path, target_defaults, variables -Index: node-v6.12.2/doc/node.1 +Index: node-v6.14.2/doc/node.1 =================================================================== ---- node-v6.12.2.orig/doc/node.1 -+++ node-v6.12.2/doc/node.1 +--- node-v6.14.2.orig/doc/node.1 ++++ node-v6.14.2/doc/node.1 @@ -26,12 +26,12 @@ .SH NAME @@ -212,10 +172,10 @@ .RB [ \-\-v8-options ] Execute without arguments to start the REPL. -Index: node-v6.12.2/src/node.stp +Index: node-v6.14.2/src/node.stp =================================================================== ---- node-v6.12.2.orig/src/node.stp -+++ node-v6.12.2/src/node.stp +--- node-v6.14.2.orig/src/node.stp ++++ node-v6.14.2/src/node.stp @@ -1,4 +1,4 @@ -probe node_net_server_connection = process("node").mark("net__server__connection") +probe node_net_server_connection = process("node6").mark("net__server__connection") @@ -285,10 +245,10 @@ { scavenge = 1 << 0; compact = 1 << 1; -Index: node-v6.12.2/deps/npm/man/man1/npm.1 +Index: node-v6.14.2/deps/npm/man/man1/npm.1 =================================================================== ---- node-v6.12.2.orig/deps/npm/man/man1/npm.1 -+++ node-v6.12.2/deps/npm/man/man1/npm.1 +--- node-v6.14.2.orig/deps/npm/man/man1/npm.1 ++++ node-v6.14.2/deps/npm/man/man1/npm.1 @@ -1,11 +1,11 @@ .TH "NPM" "1" "November 2016" "" "" .SH "NAME" @@ -418,21 +378,27 @@ .RE -Index: node-v6.12.2/deps/npm/bin/npm-cli.js +Index: node-v6.14.2/deps/npm/bin/npm-cli.js =================================================================== ---- node-v6.12.2.orig/deps/npm/bin/npm-cli.js -+++ node-v6.12.2/deps/npm/bin/npm-cli.js +--- node-v6.14.2.orig/deps/npm/bin/npm-cli.js ++++ node-v6.14.2/deps/npm/bin/npm-cli.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/env node6 ;(function () { // wrapper in case we're in module_context mode // windows: running "npm blah" in this folder will invoke WSH, not node. /*global WScript*/ -Index: node-v6.12.2/src/node_main.cc +Index: node-v6.14.2/src/node_main.cc =================================================================== ---- node-v6.12.2.orig/src/node_main.cc -+++ node-v6.12.2/src/node_main.cc -@@ -52,6 +52,7 @@ int wmain(int argc, wchar_t *wargv[]) { +--- node-v6.14.2.orig/src/node_main.cc ++++ node-v6.14.2/src/node_main.cc +@@ -1,4 +1,5 @@ + #include "node.h" ++#include <stdlib.h> + + #ifdef _WIN32 + #include <windows.h> +@@ -53,6 +54,7 @@ int wmain(int argc, wchar_t *wargv[]) { int main(int argc, char *argv[]) { // Disable stdio buffering, it interacts poorly with printf() // calls elsewhere in the program (e.g., any logging from V8.) @@ -440,10 +406,10 @@ setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); return node::Start(argc, argv); -Index: node-v6.12.2/tools/test.py +Index: node-v6.14.2/tools/test.py =================================================================== ---- node-v6.12.2.orig/tools/test.py -+++ node-v6.12.2/tools/test.py +--- node-v6.14.2.orig/tools/test.py ++++ node-v6.14.2/tools/test.py @@ -858,7 +858,7 @@ class Context(object): def GetVm(self, arch, mode):
