Hello community, here is the log from the commit of package nodejs10 for openSUSE:Factory checked in at 2018-09-11 17:19:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs10 (Old) and /work/SRC/openSUSE:Factory/.nodejs10.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs10" Tue Sep 11 17:19:36 2018 rev:4 rq:634765 version:10.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs10/nodejs10.changes 2018-08-06 11:53:55.993208469 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs10.new/nodejs10.changes 2018-09-11 17:19:50.191176702 +0200 @@ -1,0 +2,46 @@ +Mon Sep 10 14:11:54 UTC 2018 - [email protected] + +- 21257.diff: Revert an upstream revert that resulted that stdout + remaining O_NONBLOCK during build process. This resulted in + build failures. + +------------------------------------------------------------------- +Mon Aug 20 09:01:38 UTC 2018 - [email protected] + +- New upstream release 10.9.0: + * buffer: + + Fix out-of-bounds (OOB) write in Buffer.write() for + UCS-2 encoding (CVE-2018-12115, bsc#1105019) + + Fix unintentional exposure of uninitialized memory in + Buffer.alloc() (bsc#1105018, CVE-2018-7166) + * deps: Upgrade to OpenSSL 1.0.2p, fixing: + + Client DoS due to large DH parameter + (CVE-2018-0732, bsc#1097158) + + ECDSA key extraction via local side-channel + * http: http.get() and http.request() (and https variants) + now accept three arguments to allow for a URL and options object + +------------------------------------------------------------------- +Mon Aug 13 10:53:42 UTC 2018 - [email protected] + +- New upstream release 10.8.0: + * deps: upgrade npm to 6.2.0 + +- Changes in version 10.7.0: + * console: The console.timeLog() method has been implemented. + * http: Added support for passing both timeout and agent options + to http.request. + * inspector: Expose the original console API in + require('inspector').console. + * napi: Added experimental support for functions dealing with + bigint numbers. + * process: + + The process.hrtime.bigint() method has been implemented. + + Added the --title command line argument to set the process + title on startup. + * trace_events: Added process_name metadata. +- icu_small_grouping.patch: upstreamed +- versioned.patch, env_shebang.patch: refreshed +- update Jan's description changes for grammar and merge into git + +------------------------------------------------------------------- Old: ---- icu_small_grouping.patch node-v10.6.0.tar.xz New: ---- 21257.diff _constraints node-v10.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs10.spec ++++++ --- /var/tmp/diff_new_pack.fDPQTH/_old 2018-09-11 17:19:52.199173633 +0200 +++ /var/tmp/diff_new_pack.fDPQTH/_new 2018-09-11 17:19:52.199173633 +0200 @@ -26,7 +26,7 @@ ########################################################### Name: nodejs10 -Version: 10.6.0 +Version: 10.9.0 Release: 0 %define node_version_number 10 @@ -110,7 +110,7 @@ ## Patches not distribution specific Patch3: fix_ci_tests.patch Patch7: manual_configure.patch -Patch8: icu_small_grouping.patch +Patch9: 21257.diff ## Patches specific to SUSE and openSUSE # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -236,8 +236,8 @@ %description Node.js is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js -uses an event-driven, non-blocking I/O model. Node.js's has a package ecosystem -called npm. +uses an event-driven, non-blocking I/O model. Node.js has a package ecosystem +provided by npm. %package devel Summary: Files needed for development of NodeJS platforms @@ -255,7 +255,7 @@ Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 Provides: npm = %{version} -Provides: npm(npm) = 6.1.0 +Provides: npm(npm) = 6.2.0 %if 0%{?suse_version} >= 1500 Recommends: python2 %else @@ -284,7 +284,7 @@ %if ! %{with intree_openssl} %endif %patch7 -p1 -%patch8 -p1 +%patch9 -p1 -R %patch101 -p1 %patch102 -p1 # Add check_output to configure script (not part of Python 2.6 in SLE11). @@ -295,6 +295,9 @@ %patch200 -p1 %patch201 -p1 +# abnormalities from patching +find -name configure.js.orig -delete + %build # Make sure nothing gets included from bundled deps: # We only delete the source and header files, because ++++++ 21257.diff ++++++ https://github.com/nodejs/node/pull/21257 diff --git a/src/node.cc b/src/node.cc index 75dbafa1ab4..7cc9131f989 100644 --- a/src/node.cc +++ b/src/node.cc @@ -100,7 +100,6 @@ typedef int mode_t; #else #include <pthread.h> #include <sys/resource.h> // getrlimit, setrlimit -#include <termios.h> // tcgetattr, tcsetattr #include <unistd.h> // setuid, getuid #endif @@ -173,9 +172,6 @@ using v8::Value; static Mutex process_mutex; static Mutex environ_mutex; -// Safe to call more than once and from signal handlers. -inline void PlatformExit(); - static bool print_eval = false; static bool force_repl = false; static bool syntax_check_only = false; @@ -886,7 +882,7 @@ void AppendExceptionLine(Environment* env, Mutex::ScopedLock lock(process_mutex); env->set_printed_error(true); - PlatformExit(); + uv_tty_reset_mode(); PrintErrorString("\n%s", arrow); return; } @@ -2797,7 +2793,7 @@ void SetupProcessObject(Environment* env, void SignalExit(int signo) { - PlatformExit(); + uv_tty_reset_mode(); v8_platform.StopTracingAgent(); #ifdef __FreeBSD__ // FreeBSD has a nasty bug, see RegisterSignalHandler for details @@ -3629,27 +3625,6 @@ static void DebugEnd(const FunctionCallbackInfo<Value>& args) { } -#ifdef __POSIX__ -static struct { - int flags; - bool isatty; - struct stat stat; - struct termios termios; -} stdio[1 + STDERR_FILENO]; - - -inline int GetFileDescriptorFlags(int fd) { - int flags; - - do { - flags = fcntl(fd, F_GETFL); - } while (flags == -1 && errno == EINTR); - - return flags; -} -#endif // __POSIX__ - - inline void PlatformInit() { #ifdef __POSIX__ #if HAVE_INSPECTOR @@ -3660,9 +3635,9 @@ inline void PlatformInit() { #endif // HAVE_INSPECTOR // Make sure file descriptors 0-2 are valid before we start logging anything. - for (auto& s : stdio) { - const int fd = &s - stdio; - if (fstat(fd, &s.stat) == 0) + for (int fd = STDIN_FILENO; fd <= STDERR_FILENO; fd += 1) { + struct stat ignored; + if (fstat(fd, &ignored) == 0) continue; // Anything but EBADF means something is seriously wrong. We don't // have to special-case EINTR, fstat() is not interruptible. @@ -3670,8 +3645,6 @@ inline void PlatformInit() { ABORT(); if (fd != open("/dev/null", O_RDWR)) ABORT(); - if (fstat(fd, &s.stat) != 0) - ABORT(); } #if HAVE_INSPECTOR @@ -3694,24 +3667,6 @@ inline void PlatformInit() { } #endif // !NODE_SHARED_MODE - // Record the state of the stdio file descriptors so we can restore it - // on exit. Needs to happen before installing signal handlers because - // they make use of that information. - for (auto& s : stdio) { - const int fd = &s - stdio; - int err; - - s.flags = GetFileDescriptorFlags(fd); - CHECK_NE(s.flags, -1); - - if (!isatty(fd)) continue; - s.isatty = true; - do { - err = tcgetattr(fd, &s.termios); - } while (err == -1 && errno == EINTR); - CHECK_EQ(err, 0); - } - RegisterSignalHandler(SIGINT, SignalExit, true); RegisterSignalHandler(SIGTERM, SignalExit, true); @@ -3752,49 +3707,6 @@ inline void PlatformInit() { } -// This function must be safe to call more than once and from signal handlers. -inline void PlatformExit() { -#ifdef __POSIX__ - for (auto& s : stdio) { - const int fd = &s - stdio; - - struct stat tmp; - if (-1 == fstat(fd, &tmp)) { - CHECK_EQ(errno, EBADF); // Program closed file descriptor. - continue; - } - - bool is_same_file = - (s.stat.st_dev == tmp.st_dev && s.stat.st_ino == tmp.st_ino); - if (!is_same_file) continue; // Program reopened file descriptor. - - int flags = GetFileDescriptorFlags(fd); - CHECK_NE(flags, -1); - - // Restore the O_NONBLOCK flag if it changed. - if (O_NONBLOCK & (flags ^ s.flags)) { - flags &= ~O_NONBLOCK; - flags |= s.flags & O_NONBLOCK; - - int err; - do { - err = fcntl(fd, F_SETFL, flags); - } while (err == -1 && errno == EINTR); - CHECK_NE(err, -1); - } - - if (s.isatty) { - int err; - do { - err = tcsetattr(fd, TCSANOW, &s.termios); - } while (err == -1 && errno == EINTR); - CHECK_NE(err, -1); - } - } -#endif // __POSIX__ -} - - void ProcessArgv(int* argc, const char** argv, int* exec_argc, @@ -4180,6 +4092,7 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, env.set_can_call_into_js(false); env.stop_sub_worker_contexts(); + uv_tty_reset_mode(); env.RunCleanup(); RunAtExit(&env); @@ -4265,7 +4178,7 @@ inline int Start(uv_loop_t* event_loop, } int Start(int argc, char** argv) { - atexit([] () { PlatformExit(); }); + atexit([] () { uv_tty_reset_mode(); }); PlatformInit(); performance::performance_node_start = PERFORMANCE_NOW(); ++++++ SHASUMS256.txt ++++++ --- /var/tmp/diff_new_pack.fDPQTH/_old 2018-09-11 17:19:52.239173571 +0200 +++ /var/tmp/diff_new_pack.fDPQTH/_new 2018-09-11 17:19:52.243173566 +0200 @@ -1,36 +1,36 @@ -ad6c4cc2be5b5427a1d48c61e86778b1f085d74a9c7e140bf5769ef025cf3b3b node-v10.6.0-aix-ppc64.tar.gz -537efef0c6fd998502fa10baf82ee21edf513256cc73575991354e19442d0b69 node-v10.6.0-darwin-x64.tar.gz -c595aa22ac2f49ada5f234c80fc1acb21394c779fea4c25ca644c5330f5edab7 node-v10.6.0-darwin-x64.tar.xz -f94ca20dc42b2fea117b96a3f51011a459bb9c6088cf9d056c1d90d7698eb9a5 node-v10.6.0-headers.tar.gz -4477b5a6ce3bd63e0d3aa695dc044bef26dfad1b9e48bc939c115386ef7dca5d node-v10.6.0-headers.tar.xz -354dc8b855faf57c7561633538a63224aeb19e109144396fae466f570feeb69e node-v10.6.0-linux-arm64.tar.gz -be37aade1c085093e276b5822a05233a1057bcafe77f5b9526dbdf622330c4bb node-v10.6.0-linux-arm64.tar.xz -a672acedb42997e8730f4a52a37ace384605cb5993b8d36b8250c6e662bc6903 node-v10.6.0-linux-armv6l.tar.gz -78ae3b7aab67f2bec636f40bbf452fdc944da750e94b9f6ac7a9bb656b946c7f node-v10.6.0-linux-armv6l.tar.xz -e058834476d06783360d4bce049870a1d36a8a4271a5e7430bac76fa8c214b06 node-v10.6.0-linux-armv7l.tar.gz -f7b107a0569b08ead918172e3db5e1791d5f8b53e423e39cbb2b858f4c766cc0 node-v10.6.0-linux-armv7l.tar.xz -f3f1a15f31ec7e99cb46a19ba9206f0e40410eb184ec18216422807c41f6561a node-v10.6.0-linux-ppc64le.tar.gz -85b2b4cea96a78712ec0e7150743a86ec5b7dba1e401bb79a4890856bcdf447a node-v10.6.0-linux-ppc64le.tar.xz -e9ec0f4f187dacba160bf7ffee6e9902940677809fc14abd0e07bbc691ec8841 node-v10.6.0-linux-s390x.tar.gz -97c7f5186e91d07e5e97b1a30be7f63d57b9c0170aca99185ff907de6f61de10 node-v10.6.0-linux-s390x.tar.xz -c9be65055b9492bad9539acdf31a37f75785f1ad58b6659166233b520a4a9290 node-v10.6.0-linux-x64.tar.gz -cfd47380729f2451169b8900b3bd65e4b9db669d1d540613758cd2ededf7b5e6 node-v10.6.0-linux-x64.tar.xz -d6328c5cdc1751c16c94a34c24f91aa4dd83a1faa6cd335787e0cf9914c80082 node-v10.6.0-sunos-x64.tar.gz -ac251c64c3f08f2f2e98fefcfcb501bd0c04248f7fe58ca1b01e303cf4b8902b node-v10.6.0-sunos-x64.tar.xz -0606d939f864599c14e98600e8b73c889bf79f019150975415ef3b4184200a99 node-v10.6.0-win-x64.7z -0b58e0414d76e48432588910ea682f002ba69d7be88deb3355ceffb2fe472f6d node-v10.6.0-win-x64.zip -2f60af4703b79673b020cfce225806a62fc53951ec626ef6de1df9e2616107d2 node-v10.6.0-win-x86.7z -e8d106b1f91c451eb599f6747701634df2783ade37b079ca3ce6337c1d2e7273 node-v10.6.0-win-x86.zip -c45d18f6e47a8dbcee7ca9c3eb271361cc6bac18b9d809fdd579eebfc4aa89eb node-v10.6.0-x64.msi -7f633b62d43c2449ce012e87b7cc27de342d7d329e665d33a31d7ab3053bf2c6 node-v10.6.0-x86.msi -418f8ee330afc8df760a5003a8a8edd4535b3e729a156134b0da83c486d5c043 node-v10.6.0.pkg -8007ebfabee18ffea0f04dbb8f85e7f4cd0a051f89dbb0e72bce5fcca684b36b node-v10.6.0.tar.gz -1960742a836db36ad1aaf3cc024e79aa067adb8460f981c7ae8409390afc7e8f node-v10.6.0.tar.xz -5fe023c34ebd0511ba19559bce2da17de38815973d3a4dce6a9613c43c10cfa8 win-x64/node.exe -73162b549bba9d446577b333a6161027da71f44ca3079e828fdb0c5422983fd4 win-x64/node.lib -74b5255ef0a63b3258aa3fe345f75f798e22ff994e9fea86be4750449e9c22a9 win-x64/node_pdb.7z -c0b61ebeea8a316ce3cff3220df99f05af174b03e136299a5055d9a204405bc2 win-x64/node_pdb.zip -7c8ddd76f0c6cdb703b156758d61c3b7290490967e3c11991d226d5eb1a6e84b win-x86/node.exe -d97d7224d01205d49274a1eaf3a8484e9eeb289d337ccc63da86ab18f8639350 win-x86/node.lib -1e02c26b1a12173a8bbe3268c3b0b85ef19570ff2a21437b1c12a91133c26cac win-x86/node_pdb.7z -d1cbd83e8127199ffc56e7ced1618984cd1cd535aa56d25b5392557ead6cabfd win-x86/node_pdb.zip +238afcb7b047691db3883b01a97f1ec458824d6d7d8412840319aeb82f3a3d5c node-v10.9.0-aix-ppc64.tar.gz +3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc node-v10.9.0-darwin-x64.tar.gz +05efb0916b5c633df29d20c6e4b6e113d5ab550e7d796da77a12d4d25ef661d1 node-v10.9.0-darwin-x64.tar.xz +aa18780a04e427b537da8f4f731ea05a8cecdd22bdf2dcd0a7f384a8e0e35874 node-v10.9.0-headers.tar.gz +a8b1b1c7b597a8aa27d8d5210788033c62bc9cc8a76c7f8a52ab5bf674e01923 node-v10.9.0-headers.tar.xz +de3f9625fd15acefce6123e7ac7e51f26b965315f0f64f00aef359d68677ec82 node-v10.9.0-linux-arm64.tar.gz +3d6aa717d98bbf901c5325a02a81048eb47212bdc44963ef8d59c6e52e987b7c node-v10.9.0-linux-arm64.tar.xz +a404f0c10150cdfa2b43d3385591c20a85432a9cdd5f97a1ce96176e268f4230 node-v10.9.0-linux-armv6l.tar.gz +558b59937cdc341c2c44b722223dc17e29d4a5c710e476648bce452f6e876777 node-v10.9.0-linux-armv6l.tar.xz +ffa57690d5a563e13ae87f6f73b4ccd91b7ba018fabf3a015076d4d44cb85840 node-v10.9.0-linux-armv7l.tar.gz +bd7fd62a1bd371d9079431581e8410cbfaa0359ccd55be6d18ae09020a341fde node-v10.9.0-linux-armv7l.tar.xz +7a61df1c5258fc91453fd38bb9f692b0761bcb57ebf3343b25a8b8f27b00ed96 node-v10.9.0-linux-ppc64le.tar.gz +552586b4f238812c9f1b79241a685fd1de47a07e125153d87d85f12073509722 node-v10.9.0-linux-ppc64le.tar.xz +c9e211d0db4c88760251e72bd93da4a9d37be0fe54b270183aabc0b0c5a9135d node-v10.9.0-linux-s390x.tar.gz +844f20a6f9acfe3a0c5d8df74871d13481dc6001b1cdc06bd1e4a0fa478eac55 node-v10.9.0-linux-s390x.tar.xz +d061760884e4705adfc858eb669c44eb66cd57e8cdf6d5d57a190e76723af416 node-v10.9.0-linux-x64.tar.gz +c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff node-v10.9.0-linux-x64.tar.xz +b8c4edc1ee389ffc96833165e9d7249d8b2d48db11ae9ec91d5787953b6d11da node-v10.9.0.pkg +f19ccc132c22e9facc1cd71c3f573aed650f31394efb37901f55a3be39e2801e node-v10.9.0-sunos-x64.tar.gz +bd2d955047884d1d858182966ca3024e29e2afeca6a5ee8759fd4e27b1f05f22 node-v10.9.0-sunos-x64.tar.xz +1ed31ba75080b16193f1c7a351807481b1f7da08bfaf7172bc07f0cf07e6ea71 node-v10.9.0.tar.gz +d17ef8eb72d6a31f50a663d554beb9bcb55aa2ce57cf189abfc9b1ba20530d02 node-v10.9.0.tar.xz +befc6962861ea4248e460120dcbfcc16fb2bf19b3d7699fa4ba72726c8cb2011 node-v10.9.0-win-x64.7z +6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e node-v10.9.0-win-x64.zip +9437af7a5d014ff9b2cf93044db528a9abd65b37dd4ea33a1433fee1ddef0729 node-v10.9.0-win-x86.7z +74b7143508b7822ac131dfac03fb6c72cabe80344410a754240cc22b7a1b84db node-v10.9.0-win-x86.zip +67b7daca5e4c2b25b18024230af5ca205717317ca1a561f4f087c2da2e4d77f3 node-v10.9.0-x64.msi +bbbf1b69ac53b5a4a631f4e78b5e72f50d54c3d5dc95cba9ae856514a7703f37 node-v10.9.0-x86.msi +f86871e83202e43b61ceb25a6c3c8f31c72bac5c536fc4a22ef3c444176789dd win-x64/node.exe +b0ca775f54aac5b6ab7685c1385449c70c9171f23155d1b351554d56360eff1c win-x64/node.lib +54a28f70d61daccc8737809363c238d833da3e485bff6355296cec7bc40c056b win-x64/node_pdb.7z +81d80db1158345d371ae60b8e6a9077d221eb98d4d1b30804fc9c6f3df9b157c win-x64/node_pdb.zip +e627f2caea2ee31caf03476a3b71f90bd276f035ba0acfc08ec0ef57f1cd4322 win-x86/node.exe +5e10b3c9b2ed2b904bd7b8f4f1041421a72a8a400d12561b604ee3ff43d54338 win-x86/node.lib +5942839ccfc72350e7c520f826d84ba0d379c04b34558ab8c8fec6dc60f87d7c win-x86/node_pdb.7z +0dbe8f4ae98e9ef41452d7eadd24f8a11a0833086fd1ee73a2230978b368ff8d win-x86/node_pdb.zip ++++++ SHASUMS256.txt.sig ++++++ Binary files /var/tmp/diff_new_pack.fDPQTH/_old and /var/tmp/diff_new_pack.fDPQTH/_new differ ++++++ _constraints ++++++ <constraints> <hardware> <disk> <size unit="G">40</size> </disk> </hardware> </constraints> ++++++ env_shebang.patch ++++++ --- /var/tmp/diff_new_pack.fDPQTH/_old 2018-09-11 17:19:52.283173504 +0200 +++ /var/tmp/diff_new_pack.fDPQTH/_new 2018-09-11 17:19:52.287173499 +0200 @@ -1,360 +1,314 @@ -Index: node-v10.4.0/deps/npm/bin/npm-cli.js +Index: node-v10.8.0/deps/npm/bin/npm-cli.js =================================================================== ---- node-v10.4.0.orig/deps/npm/bin/npm-cli.js -+++ node-v10.4.0/deps/npm/bin/npm-cli.js +--- node-v10.8.0.orig/deps/npm/bin/npm-cli.js ++++ node-v10.8.0/deps/npm/bin/npm-cli.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/node10 ;(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-v10.4.0/deps/npm/bin/npx +Index: node-v10.8.0/deps/npm/bin/npx =================================================================== ---- node-v10.4.0.orig/deps/npm/bin/npx -+++ node-v10.4.0/deps/npm/bin/npx +--- node-v10.8.0.orig/deps/npm/bin/npx ++++ node-v10.8.0/deps/npm/bin/npx @@ -1,4 +1,3 @@ -#!/bin/sh (set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix basedir=`dirname "$0"` -Index: node-v10.4.0/deps/npm/bin/npm +Index: node-v10.8.0/deps/npm/bin/npm =================================================================== ---- node-v10.4.0.orig/deps/npm/bin/npm -+++ node-v10.4.0/deps/npm/bin/npm +--- node-v10.8.0.orig/deps/npm/bin/npm ++++ node-v10.8.0/deps/npm/bin/npm @@ -1,4 +1,3 @@ -#!/bin/sh (set -o igncr) 2>/dev/null && set -o igncr; # cygwin encoding fix basedir=`dirname "$0"` -Index: node-v10.4.0/deps/npm/bin/npx-cli.js +Index: node-v10.8.0/deps/npm/bin/npx-cli.js =================================================================== ---- node-v10.4.0.orig/deps/npm/bin/npx-cli.js -+++ node-v10.4.0/deps/npm/bin/npx-cli.js +--- node-v10.8.0.orig/deps/npm/bin/npx-cli.js ++++ node-v10.8.0/deps/npm/bin/npx-cli.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/node10 const npx = require('libnpx') const path = require('path') -Index: node-v10.4.0/deps/npm/node_modules/mkdirp/bin/cmd.js +Index: node-v10.8.0/deps/npm/node_modules/mkdirp/bin/cmd.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/mkdirp/bin/cmd.js -+++ node-v10.4.0/deps/npm/node_modules/mkdirp/bin/cmd.js +--- node-v10.8.0.orig/deps/npm/node_modules/mkdirp/bin/cmd.js ++++ node-v10.8.0/deps/npm/node_modules/mkdirp/bin/cmd.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - var mkdirp = require('../'); var minimist = require('minimist'); var fs = require('fs'); -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyp +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/gyp =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyp +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/gyp @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright 2013 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyptest.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/gyptest.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/gyptest.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python -- - # Copyright (c) 2012 Google Inc. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py -=================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/samples/samples +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/samples/samples =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/samples/samples -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/samples/samples +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/samples/samples ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/samples/samples @@ -1,5 +1,3 @@ -#!/usr/bin/python - # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/setup.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/setup.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/setup.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/setup.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/setup.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/setup.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node var nopt = require("../lib/nopt") , path = require("path") , types = { num: Number -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver @@ -1,4 +1,3 @@ -#!/usr/bin/env node // Standalone semver comparison program. // Exits successfully and prints matching version(s) if // any supplied version is valid and passes all tests. -Index: node-v10.4.0/deps/npm/node_modules/nopt/bin/nopt.js +Index: node-v10.8.0/deps/npm/node_modules/nopt/bin/nopt.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/nopt/bin/nopt.js -+++ node-v10.4.0/deps/npm/node_modules/nopt/bin/nopt.js +--- node-v10.8.0.orig/deps/npm/node_modules/nopt/bin/nopt.js ++++ node-v10.8.0/deps/npm/node_modules/nopt/bin/nopt.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node var nopt = require("../lib/nopt") , path = require("path") , types = { num: Number -Index: node-v10.4.0/deps/npm/node_modules/opener/opener.js +Index: node-v10.8.0/deps/npm/node_modules/opener/opener.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/opener/opener.js -+++ node-v10.4.0/deps/npm/node_modules/opener/opener.js +--- node-v10.8.0.orig/deps/npm/node_modules/opener/opener.js ++++ node-v10.8.0/deps/npm/node_modules/opener/opener.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - "use strict"; var childProcess = require("child_process"); -Index: node-v10.4.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js +Index: node-v10.8.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js -+++ node-v10.4.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js +--- node-v10.8.0.orig/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js ++++ node-v10.8.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - /*! * Module dependencies. */ -Index: node-v10.4.0/deps/npm/node_modules/rimraf/bin.js +Index: node-v10.8.0/deps/npm/node_modules/rimraf/bin.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/rimraf/bin.js -+++ node-v10.4.0/deps/npm/node_modules/rimraf/bin.js +--- node-v10.8.0.orig/deps/npm/node_modules/rimraf/bin.js ++++ node-v10.8.0/deps/npm/node_modules/rimraf/bin.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - var rimraf = require('./') var help = false -Index: node-v10.4.0/deps/npm/node_modules/semver/bin/semver +Index: node-v10.8.0/deps/npm/node_modules/semver/bin/semver =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/semver/bin/semver -+++ node-v10.4.0/deps/npm/node_modules/semver/bin/semver +--- node-v10.8.0.orig/deps/npm/node_modules/semver/bin/semver ++++ node-v10.8.0/deps/npm/node_modules/semver/bin/semver @@ -1,4 +1,3 @@ -#!/usr/bin/env node // Standalone semver comparison program. // Exits successfully and prints matching version(s) if // any supplied version is valid and passes all tests. -Index: node-v10.4.0/deps/npm/node_modules/uuid/bin/uuid +Index: node-v10.8.0/deps/npm/node_modules/uuid/bin/uuid =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/uuid/bin/uuid -+++ node-v10.4.0/deps/npm/node_modules/uuid/bin/uuid +--- node-v10.8.0.orig/deps/npm/node_modules/uuid/bin/uuid ++++ node-v10.8.0/deps/npm/node_modules/uuid/bin/uuid @@ -1,4 +1,3 @@ -#!/usr/bin/env node var assert = require('assert'); function usage() { -Index: node-v10.4.0/deps/npm/node_modules/which/bin/which +Index: node-v10.8.0/deps/npm/node_modules/which/bin/which =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/which/bin/which -+++ node-v10.4.0/deps/npm/node_modules/which/bin/which +--- node-v10.8.0.orig/deps/npm/node_modules/which/bin/which ++++ node-v10.8.0/deps/npm/node_modules/which/bin/which @@ -1,4 +1,3 @@ -#!/usr/bin/env node var which = require("../") if (process.argv.length < 3) usage() -Index: node-v10.4.0/deps/npm/bin/node-gyp-bin/node-gyp +Index: node-v10.8.0/deps/npm/bin/node-gyp-bin/node-gyp =================================================================== ---- node-v10.4.0.orig/deps/npm/bin/node-gyp-bin/node-gyp -+++ node-v10.4.0/deps/npm/bin/node-gyp-bin/node-gyp +--- node-v10.8.0.orig/deps/npm/bin/node-gyp-bin/node-gyp ++++ node-v10.8.0/deps/npm/bin/node-gyp-bin/node-gyp @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh if [ "x$npm_config_node_gyp" = "x" ]; then node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@" else -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/bin/node-gyp.js +Index: node-v10.8.0/deps/npm/node_modules/node-gyp/bin/node-gyp.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/bin/node-gyp.js -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/bin/node-gyp.js +--- node-v10.8.0.orig/deps/npm/node_modules/node-gyp/bin/node-gyp.js ++++ node-v10.8.0/deps/npm/node_modules/node-gyp/bin/node-gyp.js @@ -1,4 +1,4 @@ -#!/usr/bin/env node +#!/usr/bin/node10 /** * Set the title. -Index: node-v10.4.0/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp +Index: node-v10.8.0/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp -+++ node-v10.4.0/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp +--- node-v10.8.0.orig/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp ++++ node-v10.8.0/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh if [ "x$npm_config_node_gyp" = "x" ]; then node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@" else -Index: node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/buildbot/buildbot_run.py +Index: node-v10.8.0/deps/npm/lib/utils/completion.sh =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/node-gyp/gyp/buildbot/buildbot_run.py -+++ node-v10.4.0/deps/npm/node_modules/node-gyp/gyp/buildbot/buildbot_run.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # Copyright (c) 2012 Google Inc. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -Index: node-v10.4.0/deps/npm/lib/utils/completion.sh -=================================================================== ---- node-v10.4.0.orig/deps/npm/lib/utils/completion.sh -+++ node-v10.4.0/deps/npm/lib/utils/completion.sh +--- node-v10.8.0.orig/deps/npm/lib/utils/completion.sh ++++ node-v10.8.0/deps/npm/lib/utils/completion.sh @@ -1,4 +1,3 @@ -#!/bin/bash ###-begin-npm-completion-### # # npm command completion script -Index: node-v10.4.0/deps/npm/configure +Index: node-v10.8.0/deps/npm/configure =================================================================== ---- node-v10.4.0.orig/deps/npm/configure -+++ node-v10.4.0/deps/npm/configure +--- node-v10.8.0.orig/deps/npm/configure ++++ node-v10.8.0/deps/npm/configure @@ -1,5 +1,3 @@ -#!/bin/bash - # set configurations that will be "sticky" on this system, # surviving npm self-updates. -Index: node-v10.4.0/deps/npm/node_modules/JSONStream/bin.js +Index: node-v10.8.0/deps/npm/node_modules/JSONStream/bin.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/JSONStream/bin.js -+++ node-v10.4.0/deps/npm/node_modules/JSONStream/bin.js +--- node-v10.8.0.orig/deps/npm/node_modules/JSONStream/bin.js ++++ node-v10.8.0/deps/npm/node_modules/JSONStream/bin.js @@ -1,4 +1,3 @@ -#! /usr/bin/env node var JSONStream = require('./') -Index: node-v10.4.0/deps/npm/node_modules/ajv/scripts/info -=================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/ajv/scripts/info -+++ node-v10.4.0/deps/npm/node_modules/ajv/scripts/info -@@ -1,4 +1,3 @@ --#!/usr/bin/env node - - 'use strict'; - -Index: node-v10.4.0/deps/npm/node_modules/ajv/scripts/prepare-tests -=================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/ajv/scripts/prepare-tests -+++ node-v10.4.0/deps/npm/node_modules/ajv/scripts/prepare-tests -@@ -1,4 +1,3 @@ --#!/usr/bin/env sh - - set -e - -Index: node-v10.4.0/deps/npm/node_modules/ajv/scripts/travis-gh-pages -=================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/ajv/scripts/travis-gh-pages -+++ node-v10.4.0/deps/npm/node_modules/ajv/scripts/travis-gh-pages -@@ -1,4 +1,3 @@ --#!/usr/bin/env bash - - set -e - -Index: node-v10.4.0/deps/npm/node_modules/errno/build.js +Index: node-v10.8.0/deps/npm/node_modules/errno/build.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/errno/build.js -+++ node-v10.4.0/deps/npm/node_modules/errno/build.js +--- node-v10.8.0.orig/deps/npm/node_modules/errno/build.js ++++ node-v10.8.0/deps/npm/node_modules/errno/build.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node @@ -367,55 +321,55 @@ -}) \ No newline at end of file +}) -Index: node-v10.4.0/deps/npm/node_modules/errno/cli.js +Index: node-v10.8.0/deps/npm/node_modules/errno/cli.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/errno/cli.js -+++ node-v10.4.0/deps/npm/node_modules/errno/cli.js +--- node-v10.8.0.orig/deps/npm/node_modules/errno/cli.js ++++ node-v10.8.0/deps/npm/node_modules/errno/cli.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node var errno = require('./') , arg = process.argv[2] -Index: node-v10.4.0/deps/npm/node_modules/is-ci/bin.js +Index: node-v10.8.0/deps/npm/node_modules/is-ci/bin.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/is-ci/bin.js -+++ node-v10.4.0/deps/npm/node_modules/is-ci/bin.js +--- node-v10.8.0.orig/deps/npm/node_modules/is-ci/bin.js ++++ node-v10.8.0/deps/npm/node_modules/is-ci/bin.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node 'use strict' process.exit(require('./') ? 0 : 1) -Index: node-v10.4.0/deps/npm/node_modules/rc/cli.js +Index: node-v10.8.0/deps/npm/node_modules/rc/cli.js =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/rc/cli.js -+++ node-v10.4.0/deps/npm/node_modules/rc/cli.js +--- node-v10.8.0.orig/deps/npm/node_modules/rc/cli.js ++++ node-v10.8.0/deps/npm/node_modules/rc/cli.js @@ -1,4 +1,3 @@ -#! /usr/bin/env node var rc = require('./index') console.log(JSON.stringify(rc(process.argv[2]), false, 2)) -Index: node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-conv +Index: node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-conv =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-conv -+++ node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-conv +--- node-v10.8.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-conv ++++ node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-conv @@ -1,4 +1,3 @@ -#!/usr/bin/env node // -*- mode: js -*- // vim: set filetype=javascript : // Copyright 2015 Joyent, Inc. All rights reserved. -Index: node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-sign +Index: node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-sign =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-sign -+++ node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-sign +--- node-v10.8.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-sign ++++ node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-sign @@ -1,4 +1,3 @@ -#!/usr/bin/env node // -*- mode: js -*- // vim: set filetype=javascript : // Copyright 2015 Joyent, Inc. All rights reserved. -Index: node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-verify +Index: node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-verify =================================================================== ---- node-v10.4.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-verify -+++ node-v10.4.0/deps/npm/node_modules/sshpk/bin/sshpk-verify +--- node-v10.8.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-verify ++++ node-v10.8.0/deps/npm/node_modules/sshpk/bin/sshpk-verify @@ -1,4 +1,3 @@ -#!/usr/bin/env node // -*- mode: js -*- ++++++ node-v10.6.0.tar.xz -> node-v10.9.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs10/node-v10.6.0.tar.xz /work/SRC/openSUSE:Factory/.nodejs10.new/node-v10.9.0.tar.xz differ: char 26, line 1 ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.fDPQTH/_old 2018-09-11 17:19:52.335173425 +0200 +++ /var/tmp/diff_new_pack.fDPQTH/_new 2018-09-11 17:19:52.335173425 +0200 @@ -8,8 +8,10 @@ This is also important for generation of binary modules for multiple versions of NodeJS ---- a/Makefile -+++ b/Makefile +Index: node-v10.8.0/Makefile +=================================================================== +--- node-v10.8.0.orig/Makefile ++++ node-v10.8.0/Makefile @@ -43,7 +43,7 @@ BUILDTYPE_LOWER := $(shell echo $(BUILDT EXEEXT := $(shell $(PYTHON) -c \ "import sys; print('.exe' if sys.platform == 'win32' else '')") @@ -19,9 +21,11 @@ NODE ?= ./$(NODE_EXE) NODE_G_EXE = node_g$(EXEEXT) NPM ?= ./deps/npm/bin/npm-cli.js ---- a/tools/install.py -+++ b/tools/install.py -@@ -78,7 +78,7 @@ def install(paths, dst): map(lambda path +Index: node-v10.8.0/tools/install.py +=================================================================== +--- node-v10.8.0.orig/tools/install.py ++++ node-v10.8.0/tools/install.py +@@ -76,7 +76,7 @@ def install(paths, dst): map(lambda path def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths) def npm_files(action): @@ -30,7 +34,7 @@ # don't install npm if the target path is a symlink, it probably means # that a dev version of npm is installed there -@@ -92,20 +92,20 @@ def npm_files(action): +@@ -90,20 +90,20 @@ def npm_files(action): action(paths, target_path + dirname[9:] + '/') # create/remove symlink @@ -57,7 +61,7 @@ else: assert(0) # unhandled action type -@@ -119,7 +119,7 @@ def subdir_files(path, dest, action): +@@ -117,7 +117,7 @@ def subdir_files(path, dest, action): def files(action): is_windows = sys.platform == 'win32' @@ -66,7 +70,7 @@ output_prefix = 'out/Release/' if 'false' == variables.get('node_shared'): -@@ -144,7 +144,7 @@ def files(action): +@@ -142,7 +142,7 @@ def files(action): action(['out/Release/node.d'], sysconfig.get_config_var("LIB") + '/dtrace/node.d') # behave similarly for systemtap @@ -75,7 +79,7 @@ action(['deps/v8/tools/gdbinit'], 'share/doc/node/') action(['deps/v8/tools/lldbinit'], 'share/doc/node/') -@@ -153,7 +153,7 @@ def files(action): +@@ -151,7 +151,7 @@ def files(action): if 'freebsd' in sys.platform or 'openbsd' in sys.platform: action(['doc/node.1'], 'man/man1/') else: @@ -84,7 +88,7 @@ if 'true' == variables.get('node_install_npm'): npm_files(action) -@@ -169,28 +169,28 @@ def headers(action): +@@ -167,28 +167,28 @@ def headers(action): 'src/node_buffer.h', 'src/node_object_wrap.h', 'src/node_version.h', @@ -121,8 +125,10 @@ def run(args): global node_prefix, install_path, target_defaults, variables ---- a/doc/node.1 -+++ b/doc/node.1 +Index: node-v10.8.0/doc/node.1 +=================================================================== +--- node-v10.8.0.orig/doc/node.1 ++++ node-v10.8.0/doc/node.1 @@ -30,24 +30,24 @@ .Dt NODE 1 . @@ -152,8 +158,10 @@ .Op Fl -v8-options . .\"====================================================================== ---- a/src/node.stp -+++ b/src/node.stp +Index: node-v10.8.0/src/node.stp +=================================================================== +--- node-v10.8.0.orig/src/node.stp ++++ node-v10.8.0/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. @@ -226,10 +234,12 @@ { scavenge = 1 << 0; compact = 1 << 1; ---- a/deps/npm/man/man1/npm.1 -+++ b/deps/npm/man/man1/npm.1 +Index: node-v10.8.0/deps/npm/man/man1/npm.1 +=================================================================== +--- node-v10.8.0.orig/deps/npm/man/man1/npm.1 ++++ node-v10.8.0/deps/npm/man/man1/npm.1 @@ -1,11 +1,11 @@ - .TH "NPM" "1" "May 2018" "" "" + .TH "NPM" "1" "July 2018" "" "" .SH "NAME" -\fBnpm\fR \- javascript package manager +\fBnpm10\fR \- javascript package manager @@ -273,7 +283,7 @@ .P In particular, npm has two modes of operation: .RS 0 -@@ -80,19 +80,19 @@ Make a package\.json file\. See npm hel +@@ -78,19 +78,19 @@ Make a package\.json file\. See npm hel link: For linking your current working code into Node's path, so that you don't have to reinstall every time you make a change\. Use @@ -296,7 +306,7 @@ .RE .SH CONFIGURATION -@@ -133,14 +133,14 @@ lib/utils/config\-defs\.js\. These must +@@ -126,7 +126,7 @@ lib/utils/config\-defs\.js\. These must .RE .P @@ -305,24 +315,7 @@ .SH CONTRIBUTIONS .P Patches welcome! - .RS 0 - .IP \(bu 2 - code: --Read through npm help 7 \fBnpm\-coding\-style\fP if you plan to submit code\. -+Read through npm10 help 7 \fBnpm\-coding\-style\fP if you plan to submit code\. - You don't have to agree with it, but you do have to follow it\. - .IP \(bu 2 - docs: -@@ -150,7 +150,7 @@ file in the "doc" folder\. (Don't worry - .RE - .P - Contributors are listed in npm's \fBpackage\.json\fP file\. You can view them --easily by doing \fBnpm view npm contributors\fP\|\. -+easily by doing \fBnpm10 view npm contributors\fP\|\. - .P - If you would like to contribute, but don't know what to work on, read - the contributing guidelines and check the issues list\. -@@ -185,21 +185,21 @@ i@izs\.me +@@ -165,21 +165,21 @@ i@izs\.me .SH SEE ALSO .RS 0 .IP \(bu 2 @@ -351,8 +344,10 @@ .RE ---- a/node.gyp -+++ b/node.gyp +Index: node-v10.8.0/node.gyp +=================================================================== +--- node-v10.8.0.orig/node.gyp ++++ node-v10.8.0/node.gyp @@ -21,8 +21,8 @@ 'node_shared_openssl%': 'false', 'node_v8_options%': '', @@ -364,8 +359,10 @@ 'node_intermediate_lib_type%': 'static_library', 'library_files': [ 'lib/internal/per_context.js', ---- a/src/node_main.cc -+++ b/src/node_main.cc +Index: node-v10.8.0/src/node_main.cc +=================================================================== +--- node-v10.8.0.orig/src/node_main.cc ++++ node-v10.8.0/src/node_main.cc @@ -119,6 +119,7 @@ int main(int argc, char* argv[]) { #endif // Disable stdio buffering, it interacts poorly with printf() @@ -374,8 +371,10 @@ setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); return node::Start(argc, argv); ---- a/deps/npm/man/man1/npx.1 -+++ b/deps/npm/man/man1/npx.1 +Index: node-v10.8.0/deps/npm/man/man1/npx.1 +=================================================================== +--- node-v10.8.0.orig/deps/npm/man/man1/npx.1 ++++ node-v10.8.0/deps/npm/man/man1/npx.1 @@ -1,32 +1,32 @@ .TH "NPX" "1" "April 2018" "[email protected]" "User Commands" .SH "NAME" @@ -459,9 +458,11 @@ +\fBnpm10\-config(7)\fP .RE ---- a/tools/test.py -+++ b/tools/test.py -@@ -907,7 +907,7 @@ class Context(object): +Index: node-v10.8.0/tools/test.py +=================================================================== +--- node-v10.8.0.orig/tools/test.py ++++ node-v10.8.0/tools/test.py +@@ -894,7 +894,7 @@ class Context(object): def GetVm(self, arch, mode): if arch == 'none':
