Hello community, here is the log from the commit of package nodejs8 for openSUSE:Factory checked in at 2018-05-18 14:26:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs8 (Old) and /work/SRC/openSUSE:Factory/.nodejs8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs8" Fri May 18 14:26:52 2018 rev:17 rq:610023 version:8.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs8/nodejs8.changes 2018-04-07 20:47:30.763116954 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs8.new/nodejs8.changes 2018-05-18 14:27:48.970561764 +0200 @@ -1,0 +2,16 @@ +Wed May 16 11:04:43 UTC 2018 - [email protected] + +- New upstream LTS release 8.11.2: + * deps: + + update node-inspect to 1.11.3 + + update nghttp2 to 1.29.0 + * http2: Sync with current release stream + * n-api: Sync with current release stream +- versioned.patch: rebased + +------------------------------------------------------------------- +Fri May 11 12:36:10 UTC 2018 - [email protected] + +- icu_61_namespacefix.patch: Fix building with ICU61.1 (bsc#1091764) + +------------------------------------------------------------------- Old: ---- node-v8.11.1.tar.xz New: ---- icu_61_namespacefix.patch node-v8.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs8.spec ++++++ --- /var/tmp/diff_new_pack.gjPjCH/_old 2018-05-18 14:27:50.010523599 +0200 +++ /var/tmp/diff_new_pack.gjPjCH/_new 2018-05-18 14:27:50.010523599 +0200 @@ -26,11 +26,17 @@ ########################################################### Name: nodejs8 -Version: 8.11.1 +Version: 8.11.2 Release: 0 %define node_version_number 8 +%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 @@ -448,7 +461,7 @@ %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 +%dir %{_defaultlicensedir} %endif %files -n npm%{node_version_number} ++++++ SHASUMS256.txt ++++++ --- /var/tmp/diff_new_pack.gjPjCH/_old 2018-05-18 14:27:50.050522131 +0200 +++ /var/tmp/diff_new_pack.gjPjCH/_new 2018-05-18 14:27:50.050522131 +0200 @@ -1,40 +1,40 @@ -0dabd62eaa3675dafb458da6206fe31a6edf3c368b428fe8d2f800b857070c44 node-v8.11.1-aix-ppc64.tar.gz -5c7b05899ff56910a2b8180f139d48612f349ac2c5d20f08dbbeffbed9e3a089 node-v8.11.1-darwin-x64.tar.gz -882fcca054d6100ca67f94e4cf50d8df141f106fafbcefc0b04facc4a9ab956c node-v8.11.1-darwin-x64.tar.xz -ea28109f7a3b3b21705f25fb0e181e984ece46e785dd9912b5c14df4c067fa07 node-v8.11.1-headers.tar.gz -0f1838be48063a0c419178b02eeffaffeb6d4b09b50b9b33b4234dc111ff64fa node-v8.11.1-headers.tar.xz -68546c94a730a8d546e37a9bbae919f4a0f864220ce3aa160461a4f3e779a6af node-v8.11.1-linux-arm64.tar.gz -ff518f33751baa8ea4f18853d446357c2edecd930a1526ac9b2eaa79baddc1bf node-v8.11.1-linux-arm64.tar.xz -10ccfd8631923cac8b0f41a83ef9316a5f19faf96de1eee66dedc20ebf9d61e7 node-v8.11.1-linux-armv6l.tar.gz -ae5d9b9804a441b786046e125380ea15755db40a99fb5551582bd6bd59ef71be node-v8.11.1-linux-armv6l.tar.xz -73abddb5e80a2926f1646b77bbb7093465b2abc43846c1b468dbccad4b72164d node-v8.11.1-linux-armv7l.tar.gz -7bb97e3b06d186cfff576096f75431eedcc0ecee16c47afe8aabd7a22cc31c47 node-v8.11.1-linux-armv7l.tar.xz -f894524124c19fcd2180a483b7a238b77a14fb81c3d4723620ec66be2635cb4f node-v8.11.1-linux-ppc64le.tar.gz -d05b8a61f253168fc228d0da270a88293d082696b179d057d8aaa5328b43fb9b node-v8.11.1-linux-ppc64le.tar.xz -179e296c0f61fda1a454cba8d24a92efdb3f0646c0efd5c1d78194acf6cfc4df node-v8.11.1-linux-s390x.tar.gz -d9e892c7222b8c93f4e57f476a031c047345db1ad6785a5c85f9db41c6f8db23 node-v8.11.1-linux-s390x.tar.xz -0e20787e2eda4cc31336d8327556ebc7417e8ee0a6ba0de96a09b0ec2b841f60 node-v8.11.1-linux-x64.tar.gz -6617e245fa0f7fbe0e373e71d543fea878315324ab31dc64b4eba10e42d04c11 node-v8.11.1-linux-x64.tar.xz -373e28cb9549fda7063b35eba84827fb0fda6c01856d0b310431eaea7d0c6d45 node-v8.11.1-linux-x86.tar.gz -cfe4f6115f9148b16e1b993a6fbbaf21aeecbb97849dd498b979d8511ff25e85 node-v8.11.1-linux-x86.tar.xz -3b6b18483e736e3d4690705559f31ead036a42396986f1e5bcb3daa776188bbc node-v8.11.1.pkg -bf9e9d404bdc7e383897e82bb834322181b440198313077e4de435a4a56fb837 node-v8.11.1-sunos-x64.tar.gz -531817fc242bd355f2438aee471bf8c31085e39927012a37eeb558b7d378d6c6 node-v8.11.1-sunos-x64.tar.xz -e2f2573a3984a155e3001ac09b78d559d506c1160fda0bba0f819021a1eeef6a node-v8.11.1-sunos-x86.tar.gz -1c7f0928a66ad986bbf7bd1fb40d45824d1fe2e2aa9fa802e6b25a76273ff674 node-v8.11.1-sunos-x86.tar.xz -86678028f13b26ceed08efc4b838921ca1bf514c0b7e8151bfec8ba15c5e66ad node-v8.11.1.tar.gz -40a6eb51ea37fafcf0cfb58786b15b99152bec672cccf861c14d1cca0ad4758a node-v8.11.1.tar.xz -c4eae881574da81c1617af754151bfbf2f6b558002b71b16d580261ab86bfa6b node-v8.11.1-win-x64.7z -7d49b59c2b5d73a14c138e8a215d558a64a5241cd5035d9824f608e7bba097b1 node-v8.11.1-win-x64.zip -1328604c885d849f3b3d2c93377578b655e74a5f630b4757dbe8b16b9320d888 node-v8.11.1-win-x86.7z -c07a5eb55268c0bf491e73efb225f42a7289fd92d2b768b955ba9a49d7b916b4 node-v8.11.1-win-x86.zip -42a2a4e7972c2266174f114f732c93d183d4df2ddaa31a9d543c96f96a7b1b97 node-v8.11.1-x64.msi -7662094918364fa33b317b7788413d36ef2eb517fc4a23cee1134bab346f6de5 node-v8.11.1-x86.msi -ed9507c4c44915c1183a3bb6747c7821fb5ba194d47ff9351fa153f2ab368ed1 win-x64/node.exe -45fd5c590a3a0ee9a310b506bdf9d2e530bcdd2200aaac1030b8de1e00183181 win-x64/node.lib -b7c499c164a800579ec11061dd9771b601fe6aaa86b183b0a865d064febd4348 win-x64/node_pdb.7z -99df175e6f7fdf1da9c8a8a6c8ffc18b32537e08170b0872657adb7a57f76ed0 win-x64/node_pdb.zip -eb41ebd07e309443703e57bf54deecd00b8b7aee8edaf8eab12421117d94b117 win-x86/node.exe -ffc5bd433e8156df0de1ffd0e4060fbd218f591b861325fc3f8bd8a406b22ea6 win-x86/node.lib -6923077d76c3897fa4abb1347fd19c7f8b79659c7b71cdb6ed26dd3c69f4c91a win-x86/node_pdb.7z -4cdc022ed6f67d1e23ebfa3dd3bc9a21e05356e9d19520ed2e42c9ee8bcda68f win-x86/node_pdb.zip +9a39fa0477246ada0ba248f410c57fec25abf3c581018f4b7dbaefb3f1d6dd7f node-v8.11.2-aix-ppc64.tar.gz +6bd619ab577a1256531e50e31924d99a094eb920de8b5bd060a056a2608282b9 node-v8.11.2-darwin-x64.tar.gz +b6503f5566932cc231f581805a4ccc79eadfdad19d351e0c40a2055cff82fdc3 node-v8.11.2-darwin-x64.tar.xz +6125250fe8e074e509a7c691ebf04a93c20246fea5637ef6fe8aa844cef98b41 node-v8.11.2-headers.tar.gz +45189696c1a3f78a41adaadcc64a94cdaf4fec5210a31d6af095e87932bbacd4 node-v8.11.2-headers.tar.xz +8b376554ea7dc4ae3e2bfbd407b45ee4f978c199b1764430a40802dd6019d882 node-v8.11.2-linux-arm64.tar.gz +c8e9833402277c1a5a31b41cc31c9cedad68ba87c2ef78aed6a3ced81af9da7f node-v8.11.2-linux-arm64.tar.xz +f9614139addda5c327486a5d7e92d6a9d1bd6d8dccb3dd4eed0d0e81ec2a605d node-v8.11.2-linux-armv6l.tar.gz +6d0577d40fa61606d6c4da4bb329ca561f559dd11285af535e281b08a491ffd6 node-v8.11.2-linux-armv6l.tar.xz +5cfef0c7bd142964b195fbeed574e5887beeec5ad4f403561a78f1924b53bb38 node-v8.11.2-linux-armv7l.tar.gz +b7e2d9db8a3e6ddcb16238d08e256595874f5396c7404a9b1fe795b45654c83a node-v8.11.2-linux-armv7l.tar.xz +6f00fc607273c148670423b64485e750977f2968b1f699635ba2310012adc41e node-v8.11.2-linux-ppc64le.tar.gz +840d76db330bfc9c0b63aab61e7d79baeeccbb69833d2e3a5687013e47f03bbf node-v8.11.2-linux-ppc64le.tar.xz +cc8e3551f1c687c7912205c1e992547a021f705696f3e5e1a893f50df29803df node-v8.11.2-linux-s390x.tar.gz +ed8069f679b1bbd911c11ad193ebfeddfac0d33724c359e8f2d88f02aba6c235 node-v8.11.2-linux-s390x.tar.xz +67dc4c06a58d4b23c5378325ad7e0a2ec482b48cea802252b99ebe8538a3ab79 node-v8.11.2-linux-x64.tar.gz +213599127d24496cbf1cbb2a7c51060a3506d6b11132c59bb7f9f8a0edd210a7 node-v8.11.2-linux-x64.tar.xz +7700e140e13f49c641dc2dc6874a6c8d0aba0969fa6b728a14887d4bef3b29a8 node-v8.11.2-linux-x86.tar.gz +b380090649229d0ccc7afb8a6b432d60dd012da5e40dca903c7ac2d15f33a7a1 node-v8.11.2-linux-x86.tar.xz +b4dae89125bedd97552d88134df9110938661f43cde09c55e2b1ad61812ecaea node-v8.11.2.pkg +a2409071006c36d92ed2aa868ee5093edb11ca7c081a47195f81fa54c0fb554f node-v8.11.2-sunos-x64.tar.gz +f88abcfeeb8c49aaf9d6a39a09311c372cc3f711e14456a3c515aba22cf4ddbe node-v8.11.2-sunos-x64.tar.xz +2851fe1e9beab968e639445678ac017056e3c93ed3e8a6e4f3d16a3e616c6d67 node-v8.11.2-sunos-x86.tar.gz +f6cd3779b9c770ce82c2082084b255a790530d869fdaaf5900d5ff29a9362d18 node-v8.11.2-sunos-x86.tar.xz +0ac2c4de270caa08b5adcdb3c6bcb8aae3651a37d035d385bc819fbacaf350e6 node-v8.11.2.tar.gz +539946c0381809576bed07424a35fc1740d52f4bd56305d6278d9e76c88f4979 node-v8.11.2.tar.xz +8bbd03b041f8326aba5ab754e4619eb3322907ddbfd77b93ddbcdaa435533ce0 node-v8.11.2-win-x64.7z +bbac1f56e8001a093acb2942f8a43c3bf22aec58216f446b7bf01f6f822dfe3f node-v8.11.2-win-x64.zip +03f1bf7a206b8d24f921606ddafd865b5d60bd54e7998fc5d1744cef2e12c443 node-v8.11.2-win-x86.7z +f002b0c4e3fcfb30f15b8f52076a483f789f5413a6e406c98d629c4a9025e51f node-v8.11.2-win-x86.zip +108dd9ccd131931e42b57dc1243dc28aacfebe207de48c420a576fe453d33ed7 node-v8.11.2-x64.msi +334d5ed17811b22fafd2c359f5f5dc7e803b13ec1099a9426dbcb2ca9871add0 node-v8.11.2-x86.msi +5909e2899950e95cfb67ffca7ca4a77e70158c84bbaa3136ffd144075a12aaff win-x64/node.exe +20899b5265163175a265cd7b211dc7054642fe65155ded3c13795b0e1d430f9f win-x64/node.lib +d5d6355cd1965b1c78e2cabbf9546ca429863d47e36ed46aa0ebffd75fd3c6ca win-x64/node_pdb.7z +b70ae6ad1d65299e7e632da9ee536826a53fb01b5e934b7f86213010de3d6db5 win-x64/node_pdb.zip +cae63b5db208fca6a95f342064964bf3a2ff16c738801f002662d92a612adfed win-x86/node.exe +d6694de6420ea035f3c28a77f1527234baa1c97e690ebe9ba82ad44540c43829 win-x86/node.lib +43a2b686a5658ef82db7258efd7801c47618d076065f24702c626857edb767b0 win-x86/node_pdb.7z +61fb800c2bf4338b117cb9ae80b89f6f4f35ae87027a33b2985217671ecefcb8 win-x86/node_pdb.zip ++++++ SHASUMS256.txt.sig ++++++ Binary files /var/tmp/diff_new_pack.gjPjCH/_old and /var/tmp/diff_new_pack.gjPjCH/_new differ ++++++ icu_61_namespacefix.patch ++++++ 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 diff --git a/src/inspector_io.cc b/src/inspector_io.cc index 9af4458c6b..01ddc296b0 100644 --- a/src/inspector_io.cc +++ b/src/inspector_io.cc @@ -74,11 +74,11 @@ std::string StringViewToUtf8(const StringView& view) { size_t result_length = view.length() * sizeof(*source); std::string result(result_length, '\0'); - UnicodeString utf16(unicodeSource, view.length()); + icu::UnicodeString utf16(unicodeSource, view.length()); // ICU components for std::string compatibility are not enabled in build... bool done = false; while (!done) { - CheckedArrayByteSink sink(&result[0], result_length); + icu::CheckedArrayByteSink sink(&result[0], result_length); utf16.toUTF8(sink); result_length = sink.NumberOfBytesAppended(); result.resize(result_length); @@ -111,8 +111,9 @@ void ReleasePairOnAsyncClose(uv_handle_t* async) { } // namespace std::unique_ptr<StringBuffer> Utf8ToStringView(const std::string& message) { - UnicodeString utf16 = - UnicodeString::fromUTF8(StringPiece(message.data(), message.length())); + icu::UnicodeString utf16 = + icu::UnicodeString::fromUTF8(icu::StringPiece(message.data(), + message.length())); StringView view(reinterpret_cast<const uint16_t*>(utf16.getBuffer()), utf16.length()); return StringBuffer::create(view); diff --git a/src/node_i18n.cc b/src/node_i18n.cc index 71ae6a0003..d65fc55ed1 100644 --- a/src/node_i18n.cc +++ b/src/node_i18n.cc @@ -523,7 +523,7 @@ const char* GetVersion(const char* type, } else if (!strcmp(type, TYPE_UNICODE)) { return U_UNICODE_VERSION; } else if (!strcmp(type, TYPE_TZ)) { - return TimeZone::getTZDataVersion(*status); + return icu::TimeZone::getTZDataVersion(*status); } else if (!strcmp(type, TYPE_CLDR)) { UVersionInfo versionArray; ulocdata_getCLDRVersion(versionArray, status); diff --git a/tools/icu/iculslocs.cc b/tools/icu/iculslocs.cc index ca312b7835..3ceb8d2a4d 100644 --- a/tools/icu/iculslocs.cc +++ b/tools/icu/iculslocs.cc @@ -64,7 +64,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() { @@ -147,7 +147,7 @@ int localeExists(const char* loc, UBool* exists) { if (VERBOSE > 1) { 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)) { @@ -189,11 +189,11 @@ void printIndent(FILE* bf, int indent) { * @return 0 for OK, 1 for err */ int dumpAllButInstalledLocales(int lev, - LocalUResourceBundlePointer* bund, + icu::LocalUResourceBundlePointer* bund, FILE* 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"); @@ -254,10 +254,10 @@ int list(const char* toBundle) { 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( // NOLINTNEXTLINE (readability/null_usage) 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-v8.11.1.tar.xz -> node-v8.11.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs8/node-v8.11.1.tar.xz /work/SRC/openSUSE:Factory/.nodejs8.new/node-v8.11.2.tar.xz differ: char 27, line 1 ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.gjPjCH/_old 2018-05-18 14:27:50.118519636 +0200 +++ /var/tmp/diff_new_pack.gjPjCH/_new 2018-05-18 14:27:50.122519489 +0200 @@ -8,10 +8,10 @@ This is also important for generation of binary modules for multiple versions of NodeJS -Index: node-v8.10.0/Makefile +Index: node-v8.11.2/Makefile =================================================================== ---- node-v8.10.0.orig/Makefile -+++ node-v8.10.0/Makefile +--- node-v8.11.2.orig/Makefile ++++ node-v8.11.2/Makefile @@ -46,7 +46,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -21,10 +21,10 @@ NODE ?= ./$(NODE_EXE) NODE_G_EXE = node_g$(EXEEXT) NPM ?= ./deps/npm/bin/npm-cli.js -Index: node-v8.10.0/tools/install.py +Index: node-v8.11.2/tools/install.py =================================================================== ---- node-v8.10.0.orig/tools/install.py -+++ node-v8.10.0/tools/install.py +--- node-v8.11.2.orig/tools/install.py ++++ node-v8.11.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) @@ -125,10 +125,10 @@ def run(args): global node_prefix, install_path, target_defaults, variables -Index: node-v8.10.0/doc/node.1 +Index: node-v8.11.2/doc/node.1 =================================================================== ---- node-v8.10.0.orig/doc/node.1 -+++ node-v8.10.0/doc/node.1 +--- node-v8.11.2.orig/doc/node.1 ++++ node-v8.11.2/doc/node.1 @@ -26,12 +26,12 @@ .SH NAME @@ -161,10 +161,10 @@ .RB [ \-\-v8-options ] Execute without arguments to start the REPL. -Index: node-v8.10.0/src/node.stp +Index: node-v8.11.2/src/node.stp =================================================================== ---- node-v8.10.0.orig/src/node.stp -+++ node-v8.10.0/src/node.stp +--- node-v8.11.2.orig/src/node.stp ++++ node-v8.11.2/src/node.stp @@ -19,7 +19,7 @@ // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -237,10 +237,10 @@ { scavenge = 1 << 0; compact = 1 << 1; -Index: node-v8.10.0/deps/npm/man/man1/npm.1 +Index: node-v8.11.2/deps/npm/man/man1/npm.1 =================================================================== ---- node-v8.10.0.orig/deps/npm/man/man1/npm.1 -+++ node-v8.10.0/deps/npm/man/man1/npm.1 +--- node-v8.11.2.orig/deps/npm/man/man1/npm.1 ++++ node-v8.11.2/deps/npm/man/man1/npm.1 @@ -1,11 +1,11 @@ .TH "NPM" "1" "February 2018" "" "" .SH "NAME" @@ -370,78 +370,44 @@ .RE -Index: node-v8.10.0/node.gyp +Index: node-v8.11.2/node.gyp =================================================================== ---- node-v8.10.0.orig/node.gyp -+++ node-v8.10.0/node.gyp -@@ -21,7 +21,7 @@ +--- node-v8.11.2.orig/node.gyp ++++ node-v8.11.2/node.gyp +@@ -21,8 +21,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%': 'node8', ++ 'node_lib_target_name%': 'node8_lib', + 'node_intermediate_lib_type%': 'static_library', 'library_files': [ 'lib/internal/bootstrap_node.js', - 'lib/async_hooks.js', -@@ -650,10 +650,10 @@ - { - 'action_name': 'node_dtrace_provider_o', - 'inputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace.o', -+ '<(OBJ_DIR)/node8/src/node_dtrace.o', - ], - 'outputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace_provider.o' -+ '<(OBJ_DIR)/node8/src/node_dtrace_provider.o' - ], - 'action': [ 'dtrace', '-G', '-xnolibs', '-s', 'src/node_provider.d', - '<@(_inputs)', '-o', '<@(_outputs)' ] -@@ -703,7 +703,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/v8constants.h' - ], - 'outputs': [ -- '<(OBJ_DIR)/node/src/node_dtrace_ustack.o' -+ '<(OBJ_DIR)/node8/src/node_dtrace_ustack.o' - ], - 'conditions': [ - [ 'target_arch=="ia32" or target_arch=="arm"', { -@@ -764,9 +764,9 @@ - ], - - 'variables': { -- 'OBJ_PATH': '<(OBJ_DIR)/node/src', -- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen', -- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing', -+ 'OBJ_PATH': '<(OBJ_DIR)/node8/src', -+ 'OBJ_GEN_PATH': '<(OBJ_DIR)/node8/gen', -+ 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node8/src/tracing', - 'OBJ_SUFFIX': 'o', - 'OBJ_SEPARATOR': '/', - 'conditions': [ -@@ -1025,7 +1025,7 @@ - ['OS=="aix"', { - 'targets': [ - { -- 'target_name': 'node', -+ 'target_name': 'node8', - 'conditions': [ - ['node_shared=="true"', { - 'type': 'shared_library', -Index: node-v8.10.0/deps/npm/bin/npm-cli.js +Index: node-v8.11.2/deps/npm/bin/npm-cli.js =================================================================== ---- node-v8.10.0.orig/deps/npm/bin/npm-cli.js -+++ node-v8.10.0/deps/npm/bin/npm-cli.js +--- node-v8.11.2.orig/deps/npm/bin/npm-cli.js ++++ node-v8.11.2/deps/npm/bin/npm-cli.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/env node8 ;(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-v8.10.0/src/node_main.cc +Index: node-v8.11.2/src/node_main.cc =================================================================== ---- node-v8.10.0.orig/src/node_main.cc -+++ node-v8.10.0/src/node_main.cc -@@ -101,6 +101,7 @@ int main(int argc, char *argv[]) { +--- node-v8.11.2.orig/src/node_main.cc ++++ node-v8.11.2/src/node_main.cc +@@ -21,6 +21,7 @@ + + #include "node.h" + #include <stdio.h> ++#include <stdlib.h> + + #ifdef _WIN32 + #include <windows.h> +@@ -101,6 +102,7 @@ int main(int argc, char *argv[]) { #endif // Disable stdio buffering, it interacts poorly with printf() // calls elsewhere in the program (e.g., any logging from V8.) @@ -449,10 +415,10 @@ setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); return node::Start(argc, argv); -Index: node-v8.10.0/tools/test.py +Index: node-v8.11.2/tools/test.py =================================================================== ---- node-v8.10.0.orig/tools/test.py -+++ node-v8.10.0/tools/test.py +--- node-v8.11.2.orig/tools/test.py ++++ node-v8.11.2/tools/test.py @@ -905,7 +905,7 @@ class Context(object): def GetVm(self, arch, mode):
