commit nodejs10 for openSUSE:Factory
Hello community, here is the log from the commit of package nodejs10 for openSUSE:Factory checked in at 2018-10-25 09:09:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs10 (Old) and /work/SRC/openSUSE:Factory/.nodejs10.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nodejs10" Thu Oct 25 09:09:10 2018 rev:5 rq:643911 version:10.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs10/nodejs10.changes 2018-09-11 17:19:50.191176702 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs10.new/nodejs10.changes 2018-10-25 09:09:43.298383857 +0200 @@ -1,0 +2,97 @@ +Tue Oct 16 09:34:09 UTC 2018 - adam.majer@suse.de + +- node-gyp-addon-gypi.patch: patch fixes (bsc#1094617) + +------------------------------------------------------------------- +Sun Oct 14 14:54:04 UTC 2018 - adam.majer@suse.de + +- add support for runnign valgrind tests during check, disabled + by default +- valgrind_fixes.patch: valgrind fixes + +------------------------------------------------------------------- +Thu Oct 11 11:50:27 UTC 2018 - adam.majer@suse.de + +- New upstream version 10.12.0: + * cli: + + The options parser now normalizes _ to - in all multi-word + command-line flags, e.g. --no_warnings == --no-warnings + + Added bash completion for the node binary. + To generate a bash completion script, run node --completion-bash. + * crypto: + + Added support for PEM-level encryption. + + Added an API asymmetric key pair generation. + * fs: Added a recursive option to fs.mkdir and fs.mkdirSync. + * http2: + + Added support for the ORIGIN frame. + + Added a 'ping' event to Http2Session that is emitted whenever + a non-ack PING is received. + + Updated nghttp2 to 1.34.0. This adds RFC 8441 extended + connect protocol support to allow use of WebSockets over HTTP/2. + * module: Added module.createRequireFromPath(filename). This + new method can be used to create a custom require function that + will resolve modules relative to the filename path. + * process: Added a 'multipleResolves' process event that + is emitted whenever a Promise is attempted to be resolved + multiple times, e.g. if the resolve and reject functions are + both called in a Promise executor. + * url: Added url.fileURLToPath(url) and url.pathToFileURL(path) + * util: + + Added the sorted option to util.inspect() + + Added support for BigInt numbers in util.format() + * V8 API: A number of V8 C++ APIs have been marked as deprecated + * Workers: + + Added debugging support for Workers via DevTools protocol + + The public inspector module is now enabled in Workers. +- fix_ci_tests.patch: updated + +------------------------------------------------------------------- +Fri Oct 5 10:54:46 UTC 2018 - adam.majer@suse.de + +- fix_ci_tests.patch: fix unit tests + +------------------------------------------------------------------- +Tue Sep 25 16:00:11 UTC 2018 - adam.majer@suse.de + +- New upstream version 10.11.0: + * fs: Fixed fsPromises.readdir withFileTypes. + * http2: Added http2stream.endAfterHeaders property. + * util: Added util.types.isBoxedPrimitive(value). +- 21257.diff: drop the patch in favour of running node compilation + by redirecting stdio through a FIFO +- versioned.patch: refreshed +- fix_ci_tests.patch: explicity disable doc target in unit tests + +------------------------------------------------------------------- +Wed Sep 12 10:02:47 UTC 2018 - adam.majer@suse.de + +- New upstream version 10.10.0: + * child_process: TypedArray and DataView values are now accepted as + input by execFileSync and spawnSync. + * coverage: Native V8 code coverage information can now be output to + disk by setting the environment variable NODE_V8_COVERAGE + to a directory. + * deps: The bundled npm was upgraded to version 6.4.1. + * fs: + + The methods fs.read, fs.readSync, fs.write, fs.writeSync, + fs.writeFile and fs.writeFileSync now all accept TypedArray and + DataView objects. + + A new boolean option, withFileTypes, can be passed to + fs.readdir and fs.readdirSync. If set to true, the methods + return an array of directory entries. These are objects that + can be used to determine the type of each entry and filter them + based on that without calling fs.stat. + * http2: The http2 module is no longer experimental. + * os: Added two new methods: os.getPriority and os.setPriority, + allowing to manipulate the scheduling priority of processes. + * process: Added process.allowedNodeEnvironmentFlags. This object + can be used to programmatically validate and list flags that + are allowed in the NODE_OPTIONS environment variable. + * src: Deprecated option variables in public C++ API. + * vm: Added vm.compileFunction, a method to create new JavaScript + functions from a source body, with options similar to those of + the other vm methods. +- 21257.diff: refresh patch (and make it forward apply) +- versioned.patch, env_shebang.path: refreshed + +------------------------------------------------------------------- Old: ---- 21257.diff _constraints node-v10.9.0.tar.xz New: ---- bash_output_helper.bash node-v10.12.0.tar.xz node_modules.tar.xz update_npm_tarball.sh valgrind_fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs10.spec ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.578383092 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.578383092 +0200 @@ -26,7 +26,7 @@ ########################################################### Name: nodejs10 -Version: 10.9.0 +Version: 10.12.0 Release: 0 %define node_version_number 10 @@ -37,12 +37,13 @@ %define openssl_req_ver 1.0.2 %endif +%bcond_with valgrind_tests + %if 0%{?suse_version} == 1110 %define _libexecdir %{_exec_prefix}/lib %endif -# Only Leap 42.2+, SLE 12 SP2+ and Tumbleweed have OpenSSL 1.0.2. -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 +%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120400 %bcond_with intree_openssl %else %bcond_without intree_openssl @@ -98,6 +99,8 @@ %bcond_without binutils_gold %endif +%define git_node 0 + Summary: Evented I/O for V8 JavaScript License: MIT Group: Development/Languages/NodeJS @@ -106,11 +109,15 @@ Source1: https://nodejs.org/dist/v%{version}/SHASUMS256.txt Source2: https://nodejs.org/dist/v%{version}/SHASUMS256.txt.sig Source3: nodejs.keyring +# Only required to run unit tests in NodeJS 10+ +Source10: update_npm_tarball.sh +Source11: node_modules.tar.xz +Source20: bash_output_helper.bash ## Patches not distribution specific Patch3: fix_ci_tests.patch Patch7: manual_configure.patch -Patch9: 21257.diff +Patch11: valgrind_fixes.patch ## Patches specific to SUSE and openSUSE # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -130,7 +137,7 @@ Patch201: env_shebang.patch -%if %{with binutils_gold} +%if 0%{with binutils_gold} BuildRequires: binutils-gold %endif @@ -177,7 +184,12 @@ BuildRequires: python %endif -%if ! %{with intree_openssl} +%if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 +BuildRequires: group(nobody) +BuildRequires: user(nobody) +%endif + +%if ! 0%{with intree_openssl} %if %node_version_number >= 8 BuildRequires: openssl-devel >= %{openssl_req_ver} @@ -192,16 +204,20 @@ %endif # older node doesn't support OpenSSL 1.1 %endif # ! {with intree_openssl} -%if ! %{with intree_cares} +%if ! 0%{with intree_cares} BuildRequires: pkgconfig(libcares) >= 1.10.0 %endif -%if ! %{with intree_icu} +%if ! 0%{with intree_icu} BuildRequires: pkgconfig(icu-i18n) >= 57 %endif -%if ! %{with intree_nghttp2} -BuildRequires: libnghttp2-devel >= 1.31.0 +%if ! 0%{with intree_nghttp2} +BuildRequires: libnghttp2-devel >= 1.34.0 +%endif + +%if 0%{with valgrind_tests} +BuildRequires: valgrind %endif Requires(post): update-alternatives @@ -255,7 +271,7 @@ Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 Provides: npm = %{version} -Provides: npm(npm) = 6.2.0 +Provides: npm(npm) = 6.4.1 %if 0%{?suse_version} >= 1500 Recommends: python2 %else @@ -278,13 +294,24 @@ The API documentation for the Node.js JavaScript runtime. %prep +%if ! %{git_node} echo "`grep node-v%{version}.tar.xz %{S:1} | head -n1 | cut -c1-64` %{S:0}" | sha256sum -c %setup -q -n node-v%{version} +%else +%setup -q -n node-%{version} +%endif + +%if %{node_version_number} >= 10 +tar Jxvf %{SOURCE11} +%endif # node_version_number + %patch3 -p1 -%if ! %{with intree_openssl} +%if ! 0%{with intree_openssl} %endif %patch7 -p1 -%patch9 -p1 -R +%if 0%{with valgrind_tests} +%patch11 -p1 +%endif %patch101 -p1 %patch102 -p1 # Add check_output to configure script (not part of Python 2.6 in SLE11). @@ -299,18 +326,19 @@ find -name configure.js.orig -delete %build +. %{SOURCE20} # Make sure nothing gets included from bundled deps: # We only delete the source and header files, because # the remaining build scripts are still used. -%if ! %{with intree_openssl} +%if ! 0%{with intree_openssl} find deps/openssl -name *.[ch] -delete %endif -%if ! %{with intree_icu} +%if ! 0%{with intree_icu} rm -rf deps/icu-small %endif -%if ! %{with intree_cares} +%if ! 0%{with intree_cares} find deps/cares -name *.[ch] -delete %endif @@ -335,14 +363,14 @@ ./configure \ --prefix=%{_prefix} \ -%if ! %{with intree_openssl} +%if ! 0%{with intree_openssl} --shared-openssl \ %endif --shared-zlib \ -%if ! %{with intree_cares} +%if ! 0%{with intree_cares} --shared-cares \ %endif -%if ! %{with intree_icu} +%if ! 0%{with intree_icu} --with-intl=system-icu \ %else %if %{has_small_icu} @@ -350,22 +378,29 @@ --with-icu-source=deps/icu-small \ %endif %endif -%if ! %{with intree_nghttp2} +%if ! 0%{with intree_nghttp2} --shared-nghttp2 \ %endif -%if %{with gdb} +%if 0%{with gdb} --gdb \ %endif --without-dtrace \ --openssl-use-def-ca-store -make %{?_smp_mflags} +decoupled_cmd make %{?_smp_mflags} # Fix documentation permissions find doc/api -type f -exec chmod 0644 {} + %install -%make_install %{?_smp_mflags} +. %{SOURCE20} + +%if 0%{?cc_exec:1} +export CC=%{?cc_exec} +export CXX=%{?cpp_exec} +%endif + +decoupled_cmd %make_install %{?_smp_mflags} rm %{buildroot}%{_datadir}/doc/node/gdbinit rm -f %{buildroot}%{_datadir}/doc/node/lldbinit rm -f %{buildroot}%{_datadir}/doc/node/lldb_commands.py @@ -443,6 +478,11 @@ %endif %check +%if 0%{?cc_exec:1} +export CC=%{?cc_exec} +export CXX=%{?cpp_exec} +%endif + ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi # Tarball doesn't have eslint package distributed, so disable some tests find test -name \*-eslint-\* -print -delete @@ -453,8 +493,12 @@ test/parallel/test-dns-resolveany.js # multicast test fail since no socket? rm -f test/parallel/test-dgram-membership.js -# Run CI tests - 'advisory for now' -make test-ci || echo "****** UNIT TESTS NOT ALL HAPPY *****" +# Run CI tests +%if 0%{with valgrind_tests} +# valgrind may have false positives, so do not fail on these by default +make test-valgrind ||: +%endif +make test-ci %files %defattr(-, root, root) ++++++ SHASUMS256.txt ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.614383070 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.614383070 +0200 @@ -1,36 +1,36 @@ -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 +eb8cb1aa1f3ee9bc376d3654ce6410980e9c42b5d09eddca73f5d624bec22861 node-v10.12.0-aix-ppc64.tar.gz +f275c901b9aeaacea2bf22648329c2e9ade5e1ff63a446b83446d5d4e19464cc node-v10.12.0-darwin-x64.tar.gz +4ae6608a149a3005864a31fa4f462d49cd833814c561aa3ab22757519f62d5c1 node-v10.12.0-darwin-x64.tar.xz +903d0a0d28c82907bcc0bf500384096dcf330f55a78589a532658fd43dd92cc2 node-v10.12.0-headers.tar.gz +9432aa34583a3b19ca9be8229676ff138223872e4c2412976d00fc36e4b54f34 node-v10.12.0-headers.tar.xz +35108e762de4d449ae012c69c5927023806b2e447070d712630e78ab1f1d2cd5 node-v10.12.0-linux-arm64.tar.gz +b327deca4e380559c8c1fbacb9e668b49127ea998de4c8fe83912838cf786786 node-v10.12.0-linux-arm64.tar.xz +b051ddfb00fa949c0201821e36f963be9f2b763e240dbdcaa4aa03cfa1ef8a85 node-v10.12.0-linux-armv6l.tar.gz +88b507572b151fe02b450d4b6fb1fa7b54adb65392845045dd247a0c012f56c8 node-v10.12.0-linux-armv6l.tar.xz +09125bb4a8e80a4b04f6723014a7e33d334fee83bf8e187e25352279dcc0f0a7 node-v10.12.0-linux-armv7l.tar.gz +8497633db68a26ae0cc57791dc06a60e2d6a9319b19cfa717d2eb822952afc7a node-v10.12.0-linux-armv7l.tar.xz +8731c5b1fe53874378f8888e9b75196a8c22a5d7e67be9be459cae92a784c7b6 node-v10.12.0-linux-ppc64le.tar.gz +9a0558fcbd63bf582125a402ca3b31ae0ac13261ba66eb34c5fe0755ae0a90d6 node-v10.12.0-linux-ppc64le.tar.xz +1da89b1617a03cec8b6c497352afb9eb2578b5ae539433bc945d0eb642f7119f node-v10.12.0-linux-s390x.tar.gz +39bcdc9a46245bfdf651714a49e840ed5505aedc5f1f9cc80e4d2afecd3ac9b3 node-v10.12.0-linux-s390x.tar.xz +8d13d57aaf95177e97d29c0944d79a17de8c3a31ba3fe88d1846cfd907e52111 node-v10.12.0-linux-x64.tar.gz +4eba2e9a6db95745b769915d58e57df6ca6724ec1f023f76556fce30ceca2367 node-v10.12.0-linux-x64.tar.xz +a22893b99cef0dd8718dc471d0a54b768f5c5da0135f004d0d222b186b237ba3 node-v10.12.0.pkg +d459688a5539bfc65977657d198615ffd4da21bdd6a53ec92ee301943a33c53a node-v10.12.0-sunos-x64.tar.gz +d308134ff457fe781bc60c8a277ac39eec4f6514ad08ba4de36f0ec49eaace0b node-v10.12.0-sunos-x64.tar.xz +c6552b95062f5e9f3a27da6fdb57914ab4b27a9aa2e783fb050791166554d059 node-v10.12.0.tar.gz +d9cd890d6c3b060f7a5497a522564328fe73ec39dda082f41c4141a73ac30ae4 node-v10.12.0.tar.xz +2d6f1b952d48a89d34a18b05cdef0af4f7ab13ba8c4f8dc42a458ea15023f645 node-v10.12.0-win-x64.7z +44c938cf1409562d25d23b7c6bce110b53cd2a73774bed573b2979f0d88f51f8 node-v10.12.0-win-x64.zip +c376c7e3fe5de91c5e71fd4c7324f705679eb9899850851b93c2292eb85b4594 node-v10.12.0-win-x86.7z +2cb4521b904f0e711ca76fcee70e40d4c23a48ce84cf09a867e65a01deff4f4a node-v10.12.0-win-x86.zip +21fcc88b9af133b0ecdf03a0cdf965ad5f2a547759096fb3b050be4ca871de8f node-v10.12.0-x64.msi +a12d102d85a6d317a7462a2e453ddbc934e0b5255368493535f49ee64ffbcbc7 node-v10.12.0-x86.msi +f52da19ae108f7113808698156dd8a9153ae5af5fba8005fdebd437788e2eea5 win-x64/node.exe +23143ab50dba73be1ac5322e748f94e491fa7f99b04102abeb6a59a593544157 win-x64/node.lib +557b9213079a6f6052ff8eb2800b52224a4b540a148f02a0c0ee3c7c7604a2c5 win-x64/node_pdb.7z +ac43b58e67552ff1d7dde41e6f8bf4cdc88112d71ebf3d6a585c9d2f744e8814 win-x64/node_pdb.zip +9aa54215250da53f9e6e1099eff29ad6d6428616b5acd8f6a501ed78375bb99e win-x86/node.exe +531df749aaeb0f90c7c6fff85d65c6a7ee213fb32346c95030ee25c168a7ab68 win-x86/node.lib +ed07d34aec38f0db8e46527a1ad0dda888e3225cbde1f7e601628a13da2cc7ab win-x86/node_pdb.7z +56bbff589740b76c3dc34f5d7adce04d2a1f5c15846b95af5391c779b1408bb1 win-x86/node_pdb.zip ++++++ SHASUMS256.txt.sig ++++++ Binary files /var/tmp/diff_new_pack.FnS95C/_old and /var/tmp/diff_new_pack.FnS95C/_new differ ++++++ bash_output_helper.bash ++++++ # # Node can break stdin/stdout/stderr by setting them O_NONBLOCK # and then not resetting it back to blocking mode on exit # This function redirects stdio descriptors via new logging pipe # function decoupled_cmd { mkfifo _log ($@) < /dev/null > _log 2>_log & cat _log rm _log wait $! } ++++++ env_shebang.patch ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.650383049 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.650383049 +0200 @@ -1,314 +1,304 @@ -Index: node-v10.8.0/deps/npm/bin/npm-cli.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/bin/npm-cli.js ++++ node-v10.10.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.8.0/deps/npm/bin/npx +Index: node-v10.10.0/deps/npm/bin/npx =================================================================== ---- node-v10.8.0.orig/deps/npm/bin/npx -+++ node-v10.8.0/deps/npm/bin/npx +--- node-v10.10.0.orig/deps/npm/bin/npx ++++ node-v10.10.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.8.0/deps/npm/bin/npm +Index: node-v10.10.0/deps/npm/bin/npm =================================================================== ---- node-v10.8.0.orig/deps/npm/bin/npm -+++ node-v10.8.0/deps/npm/bin/npm +--- node-v10.10.0.orig/deps/npm/bin/npm ++++ node-v10.10.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.8.0/deps/npm/bin/npx-cli.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/bin/npx-cli.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/mkdirp/bin/cmd.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/mkdirp/bin/cmd.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/gyp +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py +Index: node-v10.10.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/samples/samples +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/samples/samples ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/setup.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/setup.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/node_modules/nopt/bin/nopt.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/node_modules/semver/bin/semver ++++ node-v10.10.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.8.0/deps/npm/node_modules/nopt/bin/nopt.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/nopt/bin/nopt.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/opener/opener.js +Index: node-v10.10.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.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.8.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 +--- node-v10.10.0.orig/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js ++++ node-v10.10.0/deps/npm/node_modules/qrcode-terminal/bin/qrcode-terminal.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - /*! * Module dependencies. */ -Index: node-v10.8.0/deps/npm/node_modules/rimraf/bin.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/rimraf/bin.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/semver/bin/semver +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/semver/bin/semver ++++ node-v10.10.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.8.0/deps/npm/node_modules/uuid/bin/uuid +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/uuid/bin/uuid ++++ node-v10.10.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.8.0/deps/npm/node_modules/which/bin/which +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/which/bin/which ++++ node-v10.10.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.8.0/deps/npm/bin/node-gyp-bin/node-gyp +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/bin/node-gyp-bin/node-gyp ++++ node-v10.10.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.8.0/deps/npm/node_modules/node-gyp/bin/node-gyp.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/node-gyp/bin/node-gyp.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/npm-lifecycle/node-gyp-bin/node-gyp ++++ node-v10.10.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.8.0/deps/npm/lib/utils/completion.sh +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/lib/utils/completion.sh ++++ node-v10.10.0/deps/npm/lib/utils/completion.sh @@ -1,4 +1,3 @@ -#!/bin/bash ###-begin-npm-completion-### # # npm command completion script -Index: node-v10.8.0/deps/npm/configure +Index: node-v10.10.0/deps/npm/configure =================================================================== ---- node-v10.8.0.orig/deps/npm/configure -+++ node-v10.8.0/deps/npm/configure +--- node-v10.10.0.orig/deps/npm/configure ++++ node-v10.10.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.8.0/deps/npm/node_modules/JSONStream/bin.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/JSONStream/bin.js ++++ node-v10.10.0/deps/npm/node_modules/JSONStream/bin.js @@ -1,4 +1,3 @@ -#! /usr/bin/env node var JSONStream = require('./') -Index: node-v10.8.0/deps/npm/node_modules/errno/build.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/errno/build.js ++++ node-v10.10.0/deps/npm/node_modules/errno/build.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node @@ -321,55 +311,55 @@ -}) \ No newline at end of file +}) -Index: node-v10.8.0/deps/npm/node_modules/errno/cli.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/errno/cli.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/is-ci/bin.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/is-ci/bin.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/rc/cli.js +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/rc/cli.js ++++ node-v10.10.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.8.0/deps/npm/node_modules/sshpk/bin/sshpk-conv +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-conv ++++ node-v10.10.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.8.0/deps/npm/node_modules/sshpk/bin/sshpk-sign +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-sign ++++ node-v10.10.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.8.0/deps/npm/node_modules/sshpk/bin/sshpk-verify +Index: node-v10.10.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 +--- node-v10.10.0.orig/deps/npm/node_modules/sshpk/bin/sshpk-verify ++++ node-v10.10.0/deps/npm/node_modules/sshpk/bin/sshpk-verify @@ -1,4 +1,3 @@ -#!/usr/bin/env node // -*- mode: js -*- ++++++ fix_ci_tests.patch ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.658383044 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.658383044 +0200 @@ -2,10 +2,10 @@ Date: Dec 20 09:18:49 UTC 2017 Summary: Fix CI unit tests framework for OBS building -Index: node-v10.2.0/test/parallel/test-module-loading-globalpaths.js +Index: node-v10.12.0/test/parallel/test-module-loading-globalpaths.js =================================================================== ---- node-v10.2.0.orig/test/parallel/test-module-loading-globalpaths.js -+++ node-v10.2.0/test/parallel/test-module-loading-globalpaths.js +--- node-v10.12.0.orig/test/parallel/test-module-loading-globalpaths.js ++++ node-v10.12.0/test/parallel/test-module-loading-globalpaths.js @@ -11,6 +11,9 @@ const { addLibraryPath } = require('../c addLibraryPath(process.env); @@ -16,11 +16,11 @@ if (process.argv[2] === 'child') { console.log(require(pkgName).string); } else { -Index: node-v10.2.0/Makefile +Index: node-v10.12.0/Makefile =================================================================== ---- node-v10.2.0.orig/Makefile -+++ node-v10.2.0/Makefile -@@ -443,7 +443,7 @@ test-ci-js: | clear-stalled +--- node-v10.12.0.orig/Makefile ++++ node-v10.12.0/Makefile +@@ -454,7 +454,7 @@ test-ci-js: | clear-stalled .PHONY: test-ci # Related CI jobs: most CI tests, excluding node-test-commit-arm-fanned test-ci: LOGLEVEL := info @@ -29,11 +29,28 @@ out/Release/cctest --gtest_output=tap:cctest.tap $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \ --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \ -Index: node-v10.2.0/test/parallel/test-tls-env-bad-extra-ca.js +@@ -605,11 +605,11 @@ apidocs_json = $(addprefix out/,$(apidoc + apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) + + tools/doc/node_modules: tools/doc/package.json +-ifeq ($(node_use_openssl),true) +- cd tools/doc && $(call available-node,$(run-npm-ci)) +-else +- @echo "Skipping tools/doc/node_modules (no crypto)" +-endif ++#ifeq ($(node_use_openssl),true) ++# cd tools/doc && $(call available-node,$(run-npm-ci)) ++#else ++ @echo "Skipping tools/doc/node_modules - on purpose" ++#endif + + .PHONY: doc-only + doc-only: tools/doc/node_modules \ +Index: node-v10.12.0/test/parallel/test-tls-env-bad-extra-ca.js =================================================================== ---- node-v10.2.0.orig/test/parallel/test-tls-env-bad-extra-ca.js -+++ node-v10.2.0/test/parallel/test-tls-env-bad-extra-ca.js -@@ -35,7 +35,7 @@ fork(__filename, opts) +--- node-v10.12.0.orig/test/parallel/test-tls-env-bad-extra-ca.js ++++ node-v10.12.0/test/parallel/test-tls-env-bad-extra-ca.js +@@ -36,7 +36,7 @@ fork(__filename, opts) // TODO(addaleax): Make `SafeGetenv` work like `process.env` // encoding-wise if (!common.isWindows) { @@ -42,3 +59,150 @@ assert(re.test(stderr), stderr); } })) +Index: node-v10.12.0/test/parallel/test-tls-passphrase.js +=================================================================== +--- node-v10.12.0.orig/test/parallel/test-tls-passphrase.js ++++ node-v10.12.0/test/parallel/test-tls-passphrase.js +@@ -221,7 +221,7 @@ server.listen(0, common.mustCall(functio + }, common.mustCall()); + })).unref(); + +-const errMessagePassword = /bad decrypt/; ++const errMessagePassword = /bad (decrypt|password read)/; + + // Missing passphrase + assert.throws(function() { +Index: node-v10.12.0/test/parallel/test-crypto-scrypt.js +=================================================================== +--- node-v10.12.0.orig/test/parallel/test-crypto-scrypt.js ++++ node-v10.12.0/test/parallel/test-crypto-scrypt.js +@@ -167,7 +167,7 @@ for (const options of bad) { + + for (const options of toobig) { + const expected = { +- message: /error:[^:]+:digital envelope routines:EVP_PBE_scrypt:memory limit exceeded/, ++ message: /(error:[^:]+:digital envelope routines:EVP_PBE_scrypt:memory limit exceeded|Invalid scrypt parameter)/, + type: Error, + }; + common.expectsError(() => crypto.scrypt('pass', 'salt', 1, options, () => {}), +Index: node-v10.12.0/test/parallel/test-repl-envvars.js +=================================================================== +--- node-v10.12.0.orig/test/parallel/test-repl-envvars.js ++++ node-v10.12.0/test/parallel/test-repl-envvars.js +@@ -2,12 +2,14 @@ + + // Flags: --expose-internals + +-require('../common'); ++const common = require('../common'); + const stream = require('stream'); + const REPL = require('internal/repl'); + const assert = require('assert'); + const inspect = require('util').inspect; + ++common.skip('Not running test in OBS'); ++ + const tests = [ + { + env: {}, +Index: node-v10.12.0/test/parallel/test-fs-utimes.js +=================================================================== +--- node-v10.12.0.orig/test/parallel/test-fs-utimes.js ++++ node-v10.12.0/test/parallel/test-fs-utimes.js +@@ -186,8 +186,8 @@ process.on('exit', () => { + const path = `${tmpdir.path}/test-utimes-precision`; + fs.writeFileSync(path, ''); + +-// test Y2K38 for all platforms [except 'arm', 'OpenBSD' and 'SunOS'] +-if (!process.arch.includes('arm') && !common.isOpenBSD && !common.isSunOS) { ++// test Y2K38 for all platforms [except 'arm', 's390', 'OpenBSD' and 'SunOS'] ++if (!process.arch.includes('arm') && process.arch !== 's390' && !common.isOpenBSD && !common.isSunOS) { + // because 2 ** 31 doesn't look right + // eslint-disable-next-line space-infix-ops + const Y2K38_mtime = 2**31; +Index: node-v10.12.0/test/common/index.js +=================================================================== +--- node-v10.12.0.orig/test/common/index.js ++++ node-v10.12.0/test/common/index.js +@@ -190,6 +190,8 @@ const pwdCommand = isWindows ? + + + function platformTimeout(ms) { ++ ms = 10 * ms; // OBS overhead and such. ++ + if (process.features.debug) + ms = 2 * ms; + +Index: node-v10.12.0/test/common/index.mjs +=================================================================== +--- node-v10.12.0.orig/test/common/index.mjs ++++ node-v10.12.0/test/common/index.mjs +@@ -44,6 +44,7 @@ const { + expectsError, + skipIfInspectorDisabled, + skipIf32Bits, ++ skipIfWorker, + getArrayBufferViews, + getBufferSources, + disableCrashOnUnhandledRejection, +@@ -93,6 +94,7 @@ export { + expectsError, + skipIfInspectorDisabled, + skipIf32Bits, ++ skipIfWorker, + getArrayBufferViews, + getBufferSources, + disableCrashOnUnhandledRejection, +Index: node-v10.12.0/test/sequential/test-http2-session-timeout.js +=================================================================== +--- node-v10.12.0.orig/test/sequential/test-http2-session-timeout.js ++++ node-v10.12.0/test/sequential/test-http2-session-timeout.js +@@ -6,7 +6,7 @@ if (!common.hasCrypto) + const assert = require('assert'); + const http2 = require('http2'); + +-const serverTimeout = common.platformTimeout(200); ++const serverTimeout = common.platformTimeout(50); + + let requests = 0; + const mustNotCall = () => { +Index: node-v10.12.0/test/parallel/test-crypto-keygen.js +=================================================================== +--- node-v10.12.0.orig/test/parallel/test-crypto-keygen.js ++++ node-v10.12.0/test/parallel/test-crypto-keygen.js +@@ -171,7 +171,7 @@ function convertDERToPEM(label, der) { + // Since the private key is encrypted, signing shouldn't work anymore. + assert.throws(() => { + testSignVerify(publicKey, privateKey); +- }, /bad decrypt|asn1 encoding routines/); ++ }, /bad decrypt|asn1 encoding routines|bad password read/); + + const key = { key: privateKey, passphrase: 'secret' }; + testEncryptDecrypt(publicKey, key); +@@ -209,7 +209,7 @@ function convertDERToPEM(label, der) { + // Since the private key is encrypted, signing shouldn't work anymore. + assert.throws(() => { + testSignVerify(publicKey, privateKey); +- }, /bad decrypt|asn1 encoding routines/); ++ }, /bad decrypt|asn1 encoding routines|bad password read/); + + // Signing should work with the correct password. + testSignVerify(publicKey, { +@@ -269,7 +269,7 @@ function convertDERToPEM(label, der) { + // Since the private key is encrypted, signing shouldn't work anymore. + assert.throws(() => { + testSignVerify(publicKey, privateKey); +- }, /bad decrypt|asn1 encoding routines/); ++ }, /bad decrypt|asn1 encoding routines|bad password read/); + + testSignVerify(publicKey, { key: privateKey, passphrase: 'secret' }); + })); +@@ -302,7 +302,7 @@ function convertDERToPEM(label, der) { + // Since the private key is encrypted, signing shouldn't work anymore. + assert.throws(() => { + testSignVerify(publicKey, privateKey); +- }, /bad decrypt|asn1 encoding routines/); ++ }, /bad decrypt|asn1 encoding routines|bad password read/); + + testSignVerify(publicKey, { + key: privateKey, ++++++ node-gyp-addon-gypi.patch ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.670383037 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.670383037 +0200 @@ -8,7 +8,7 @@ + 'type': 'loadable_module', + 'product_prefix': '', + 'include_dirs': [ -+ '/usr/include/node9/', ++ '/usr/include/node10/', + '/usr/include/' + ], + @@ -60,7 +60,7 @@ + } else { + // if no --target was specified then use RPM-installed headers + log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') -+ nodeDir = '/usr/include/node9' ++ nodeDir = '/usr/include/node10' + createBuildDir() + } } ++++++ node-v10.9.0.tar.xz -> node-v10.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/nodejs10/node-v10.9.0.tar.xz /work/SRC/openSUSE:Factory/.nodejs10.new/node-v10.12.0.tar.xz differ: char 26, line 1 ++++++ update_npm_tarball.sh ++++++ #!/bin/bash # # Fetch npm module tarball that is required to run unit tests # which are not provided by upstream tarball # # This is only needed for NodeJS 10.x # set -e tar Jxf node-v10.*.tar.xz cd node-v10.*/tools/doc npm i cd ../.. exec tar Jcf ../node_modules.tar.xz tools/doc/node_modules ++++++ valgrind_fixes.patch ++++++ Index: node-v10.12.0/deps/uv/src/unix/linux-core.c =================================================================== --- node-v10.12.0.orig/deps/uv/src/unix/linux-core.c +++ node-v10.12.0/deps/uv/src/unix/linux-core.c @@ -213,6 +213,8 @@ void uv__io_poll(uv_loop_t* loop, int ti int op; int i; + memset(&e, 0, sizeof(e)); + if (loop->nfds == 0) { assert(QUEUE_EMPTY(&loop->watcher_queue)); return; ++++++ versioned.patch ++++++ --- /var/tmp/diff_new_pack.FnS95C/_old 2018-10-25 09:09:44.718383008 +0200 +++ /var/tmp/diff_new_pack.FnS95C/_new 2018-10-25 09:09:44.718383008 +0200 @@ -8,10 +8,10 @@ This is also important for generation of binary modules for multiple versions of NodeJS -Index: node-v10.8.0/Makefile +Index: node-v10.11.0/Makefile =================================================================== ---- node-v10.8.0.orig/Makefile -+++ node-v10.8.0/Makefile +--- node-v10.11.0.orig/Makefile ++++ node-v10.11.0/Makefile @@ -43,7 +43,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-v10.8.0/tools/install.py +Index: node-v10.11.0/tools/install.py =================================================================== ---- node-v10.8.0.orig/tools/install.py -+++ node-v10.8.0/tools/install.py +--- node-v10.11.0.orig/tools/install.py ++++ node-v10.11.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) @@ -125,10 +125,10 @@ def run(args): global node_prefix, install_path, target_defaults, variables -Index: node-v10.8.0/doc/node.1 +Index: node-v10.11.0/doc/node.1 =================================================================== ---- node-v10.8.0.orig/doc/node.1 -+++ node-v10.8.0/doc/node.1 +--- node-v10.11.0.orig/doc/node.1 ++++ node-v10.11.0/doc/node.1 @@ -30,24 +30,24 @@ .Dt NODE 1 . @@ -149,7 +149,7 @@ . -.Nm node +.Nm node10 - .Cm debug + .Cm inspect .Op Fl e Ar string | Ar script.js | Fl | Ar <host>:<port> .Ar ... . @@ -158,10 +158,10 @@ .Op Fl -v8-options . .\"====================================================================== -Index: node-v10.8.0/src/node.stp +Index: node-v10.11.0/src/node.stp =================================================================== ---- node-v10.8.0.orig/src/node.stp -+++ node-v10.8.0/src/node.stp +--- node-v10.11.0.orig/src/node.stp ++++ node-v10.11.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. @@ -234,12 +234,12 @@ { scavenge = 1 << 0; compact = 1 << 1; -Index: node-v10.8.0/deps/npm/man/man1/npm.1 +Index: node-v10.11.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 +--- node-v10.11.0.orig/deps/npm/man/man1/npm.1 ++++ node-v10.11.0/deps/npm/man/man1/npm.1 @@ -1,11 +1,11 @@ - .TH "NPM" "1" "July 2018" "" "" + .TH "NPM" "1" "August 2018" "" "" .SH "NAME" -\fBnpm\fR \- javascript package manager +\fBnpm10\fR \- javascript package manager @@ -252,20 +252,23 @@ .fi .RE .SH VERSION -@@ -21,16 +21,16 @@ It is extremely configurable to support +@@ -21,7 +21,7 @@ It is extremely configurable to support Most commonly, it is used to publish, discover, install, and develop node programs\. .P -Run \fBnpm help\fP to get a list of available commands\. +Run \fBnpm10 help\fP to get a list of available commands\. - .SH INTRODUCTION + .SH IMPORTANT + .P + npm is configured to use npm, Inc\.'s public registry at +@@ -35,11 +35,11 @@ terms of use\. .P You probably got npm because you want to install stuff\. .P -Use \fBnpm install blerg\fP to install the latest version of "blerg"\. Check out -npm help \fBnpm\-install\fP for more info\. It can do a lot of stuff\. +Use \fBnpm10 install blerg\fP to install the latest version of "blerg"\. Check out -+npm10 help \fBnpm\-install\fP for more info\. It can do a lot of stuff\. ++npm help \fBnpm10\-install\fP for more info\. It can do a lot of stuff\. .P -Use the \fBnpm search\fP command to show everything that's available\. -Use \fBnpm ls\fP to show everything you've installed\. @@ -274,7 +277,7 @@ .SH DEPENDENCIES .P If a package references to another package with a git URL, npm depends -@@ -48,7 +48,7 @@ the node\-gyp repository \fIhttps://gith +@@ -57,7 +57,7 @@ the node\-gyp repository \fIhttps://gith the node\-gyp Wiki \fIhttps://github\.com/TooTallNate/node\-gyp/wiki\fR\|\. .SH DIRECTORIES .P @@ -283,7 +286,7 @@ .P In particular, npm has two modes of operation: .RS 0 -@@ -78,19 +78,19 @@ Make a package\.json file\. See npm hel +@@ -87,19 +87,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 @@ -306,7 +309,7 @@ .RE .SH CONFIGURATION -@@ -126,7 +126,7 @@ lib/utils/config\-defs\.js\. These must +@@ -135,7 +135,7 @@ lib/utils/config\-defs\.js\. These must .RE .P @@ -315,7 +318,7 @@ .SH CONTRIBUTIONS .P Patches welcome! -@@ -165,21 +165,21 @@ i@izs\.me +@@ -174,21 +174,21 @@ i@izs\.me .SH SEE ALSO .RS 0 .IP \(bu 2 @@ -344,10 +347,10 @@ .RE -Index: node-v10.8.0/node.gyp +Index: node-v10.11.0/node.gyp =================================================================== ---- node-v10.8.0.orig/node.gyp -+++ node-v10.8.0/node.gyp +--- node-v10.11.0.orig/node.gyp ++++ node-v10.11.0/node.gyp @@ -21,8 +21,8 @@ 'node_shared_openssl%': 'false', 'node_v8_options%': '', @@ -359,10 +362,10 @@ 'node_intermediate_lib_type%': 'static_library', 'library_files': [ 'lib/internal/per_context.js', -Index: node-v10.8.0/src/node_main.cc +Index: node-v10.11.0/src/node_main.cc =================================================================== ---- node-v10.8.0.orig/src/node_main.cc -+++ node-v10.8.0/src/node_main.cc +--- node-v10.11.0.orig/src/node_main.cc ++++ node-v10.11.0/src/node_main.cc @@ -119,6 +119,7 @@ int main(int argc, char* argv[]) { #endif // Disable stdio buffering, it interacts poorly with printf() @@ -371,10 +374,10 @@ setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0); return node::Start(argc, argv); -Index: node-v10.8.0/deps/npm/man/man1/npx.1 +Index: node-v10.11.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 +--- node-v10.11.0.orig/deps/npm/man/man1/npx.1 ++++ node-v10.11.0/deps/npm/man/man1/npx.1 @@ -1,32 +1,32 @@ .TH "NPX" "1" "April 2018" "npx@10.1.1" "User Commands" .SH "NAME" @@ -458,10 +461,10 @@ +\fBnpm10\-config(7)\fP .RE -Index: node-v10.8.0/tools/test.py +Index: node-v10.11.0/tools/test.py =================================================================== ---- node-v10.8.0.orig/tools/test.py -+++ node-v10.8.0/tools/test.py +--- node-v10.11.0.orig/tools/test.py ++++ node-v10.11.0/tools/test.py @@ -894,7 +894,7 @@ class Context(object): def GetVm(self, arch, mode):
participants (1)
-
root