npm: updated to 6.0.1

6.0.1:
CTRL-C OUT DURING PACKAGE EXTRACTION AS MUCH AS YOU WANT!
lockfile@1.0.4: Switches to signal-exit to detect abnormal exits and remove locks.

SHRONKWRAPS AND LACKFILES
If a published modules had legacy npm-shrinkwrap.json we were saving ordinary registry dependencies (name@version) to your package-lock.json as https:// URLs instead of versions.

* When saving the lock-file compute how the dependency is being required instead of using _resolved in the package.json. This fixes the bug that was converting registry dependencies into https:// dependencies.
* When encountering a https:// URL in our lockfiles that point at our default registry, extract the version and use them as registry dependencies. This lets us heal package-lock.json files produced by 6.0.0

AUDIT AUDIT EVERYWHERE
You can't use it quite yet, but we do have a few last moment patches to npm audit to make it even better when it is turned on!

4 files changed, 38 insertions, 26 deletions

diff --git a/lang/npm/Makefile b/lang/npm/Makefile
index db372678381..901db7fe067 100644
--- a/lang/npm/Makefile
+++ b/lang/npm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/05/04 13:23:53 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/11 09:37:13 adam Exp $
 
-DISTNAME=	npm-6.0.0
-PKGREVISION=	1
+DISTNAME=	npm-6.0.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=npm/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/lang/npm/PLIST b/lang/npm/PLIST
index c8020d23088..7a158ae4d3f 100644
--- a/lang/npm/PLIST
+++ b/lang/npm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/05/02 17:03:09 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/05/11 09:37:13 adam Exp $
 bin/npm
 bin/npx
 lib/node_modules/npm/.github/CODEOWNERS
@@ -1476,14 +1476,6 @@ lib/node_modules/npm/node_modules/libcipm/lib/config/pacote-opts.js
 lib/node_modules/npm/node_modules/libcipm/lib/extract.js
 lib/node_modules/npm/node_modules/libcipm/lib/silentlog.js
 lib/node_modules/npm/node_modules/libcipm/lib/worker.js
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/LICENSE
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/README.md
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/index.js
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/node_modules/npm-package-arg/LICENSE
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/node_modules/npm-package-arg/README.md
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/node_modules/npm-package-arg/npa.js
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/node_modules/npm-package-arg/package.json
-lib/node_modules/npm/node_modules/libcipm/node_modules/lock-verify/package.json
 lib/node_modules/npm/node_modules/libcipm/node_modules/npm-logical-tree/CHANGELOG.md
 lib/node_modules/npm/node_modules/libcipm/node_modules/npm-logical-tree/LICENSE.md
 lib/node_modules/npm/node_modules/libcipm/node_modules/npm-logical-tree/README.md
@@ -2782,14 +2774,25 @@ lib/node_modules/npm/node_modules/libnpx/package.json
 lib/node_modules/npm/node_modules/libnpx/parse-args.js
 lib/node_modules/npm/node_modules/libnpx/util.js
 lib/node_modules/npm/node_modules/libnpx/y.js
-lib/node_modules/npm/node_modules/lockfile/.npmignore
+lib/node_modules/npm/node_modules/lock-verify/LICENSE
+lib/node_modules/npm/node_modules/lock-verify/README.md
+lib/node_modules/npm/node_modules/lock-verify/index.js
+lib/node_modules/npm/node_modules/lock-verify/package.json
 lib/node_modules/npm/node_modules/lockfile/.travis.yml
 lib/node_modules/npm/node_modules/lockfile/CHANGELOG.md
 lib/node_modules/npm/node_modules/lockfile/LICENSE
 lib/node_modules/npm/node_modules/lockfile/README.md
 lib/node_modules/npm/node_modules/lockfile/gen-changelog.sh
 lib/node_modules/npm/node_modules/lockfile/lockfile.js
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/CHANGELOG.md
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/LICENSE.txt
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/README.md
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/index.js
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/package.json
+lib/node_modules/npm/node_modules/lockfile/node_modules/signal-exit/signals.js
 lib/node_modules/npm/node_modules/lockfile/package.json
+lib/node_modules/npm/node_modules/lockfile/sockets.md
+lib/node_modules/npm/node_modules/lockfile/speedtest.js
 lib/node_modules/npm/node_modules/lockfile/test/basic.js
 lib/node_modules/npm/node_modules/lockfile/test/fixtures/bad-child.js
 lib/node_modules/npm/node_modules/lockfile/test/fixtures/child.js
@@ -3274,14 +3277,21 @@ lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin
 lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/package.json
 lib/node_modules/npm/node_modules/normalize-package-data/node_modules/is-builtin-module/readme.md
 lib/node_modules/npm/node_modules/normalize-package-data/package.json
+lib/node_modules/npm/node_modules/npm-audit-report/.travis.yml
 lib/node_modules/npm/node_modules/npm-audit-report/LICENSE
 lib/node_modules/npm/node_modules/npm-audit-report/README.md
+lib/node_modules/npm/node_modules/npm-audit-report/appveyor.yml
 lib/node_modules/npm/node_modules/npm-audit-report/index.js
 lib/node_modules/npm/node_modules/npm-audit-report/lib/utils.js
+lib/node_modules/npm/node_modules/npm-audit-report/node_modules/console-control-strings/LICENSE
+lib/node_modules/npm/node_modules/npm-audit-report/node_modules/console-control-strings/README.md
+lib/node_modules/npm/node_modules/npm-audit-report/node_modules/console-control-strings/index.js
+lib/node_modules/npm/node_modules/npm-audit-report/node_modules/console-control-strings/package.json
 lib/node_modules/npm/node_modules/npm-audit-report/package.json
 lib/node_modules/npm/node_modules/npm-audit-report/reporters/detail.js
 lib/node_modules/npm/node_modules/npm-audit-report/reporters/install.js
 lib/node_modules/npm/node_modules/npm-audit-report/reporters/json.js
+lib/node_modules/npm/node_modules/npm-audit-report/reporters/quiet.js
 lib/node_modules/npm/node_modules/npm-cache-filename/LICENSE
 lib/node_modules/npm/node_modules/npm-cache-filename/README.md
 lib/node_modules/npm/node_modules/npm-cache-filename/index.js
@@ -5755,12 +5765,11 @@ lib/node_modules/npm/node_modules/rimraf/README.md
 lib/node_modules/npm/node_modules/rimraf/bin.js
 lib/node_modules/npm/node_modules/rimraf/package.json
 lib/node_modules/npm/node_modules/rimraf/rimraf.js
-lib/node_modules/npm/node_modules/safe-buffer/.travis.yml
 lib/node_modules/npm/node_modules/safe-buffer/LICENSE
 lib/node_modules/npm/node_modules/safe-buffer/README.md
+lib/node_modules/npm/node_modules/safe-buffer/index.d.ts
 lib/node_modules/npm/node_modules/safe-buffer/index.js
 lib/node_modules/npm/node_modules/safe-buffer/package.json
-lib/node_modules/npm/node_modules/safe-buffer/test.js
 lib/node_modules/npm/node_modules/semver/LICENSE
 lib/node_modules/npm/node_modules/semver/README.md
 lib/node_modules/npm/node_modules/semver/bin/semver
@@ -5889,6 +5898,11 @@ lib/node_modules/npm/node_modules/tar/node_modules/minizlib/README.md
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/constants.js
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/index.js
 lib/node_modules/npm/node_modules/tar/node_modules/minizlib/package.json
+lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/LICENSE
+lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/README.md
+lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/index.d.ts
+lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/index.js
+lib/node_modules/npm/node_modules/tar/node_modules/safe-buffer/package.json
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/LICENSE
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/README.md
 lib/node_modules/npm/node_modules/tar/node_modules/yallist/iterator.js
@@ -6057,6 +6071,7 @@ lib/node_modules/npm/node_modules/update-notifier/node_modules/boxen/node_module
 lib/node_modules/npm/node_modules/update-notifier/node_modules/boxen/package.json
 lib/node_modules/npm/node_modules/update-notifier/node_modules/boxen/readme.md
 lib/node_modules/npm/node_modules/update-notifier/node_modules/chalk/index.js
+lib/node_modules/npm/node_modules/update-notifier/node_modules/chalk/index.js.flow
 lib/node_modules/npm/node_modules/update-notifier/node_modules/chalk/license
 lib/node_modules/npm/node_modules/update-notifier/node_modules/chalk/node_modules/ansi-styles/index.js
 lib/node_modules/npm/node_modules/update-notifier/node_modules/chalk/node_modules/ansi-styles/license
@@ -6213,7 +6228,6 @@ lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/no
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/base64.js
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/index.js
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/.bin/rc
-lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/.npmignore
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/LICENSE.APACHE2
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/LICENSE.BSD
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-auth-token/node_modules/rc/LICENSE.MIT
@@ -6264,7 +6278,6 @@ lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/no
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/index.js
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/license
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/.bin/rc
-lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/.npmignore
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/LICENSE.APACHE2
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/LICENSE.BSD
 lib/node_modules/npm/node_modules/update-notifier/node_modules/latest-version/node_modules/package-json/node_modules/registry-url/node_modules/rc/LICENSE.MIT
diff --git a/lang/npm/distinfo b/lang/npm/distinfo
index 5ad58f4be30..9767a22b87a 100644
--- a/lang/npm/distinfo
+++ b/lang/npm/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2018/05/04 13:23:53 fhajny Exp $
+$NetBSD: distinfo,v 1.5 2018/05/11 09:37:13 adam Exp $
 
 SHA1 (marked-0.3.19.tar.gz) = d30691ac399f05d156f40a0a893ce7a2a7f6c5be
 RMD160 (marked-0.3.19.tar.gz) = e78a28dfaf5fc1039e48f63228f892fa24a13e6f
 SHA512 (marked-0.3.19.tar.gz) = ea518863a27a07034568b0f7a3b2cd2c1ecb8d208472af0fbfa883f59662b7212d73828d67b7d0ccde7be4f706679f88190d26545ecc72965a112ee35518a55a
 Size (marked-0.3.19.tar.gz) = 100673 bytes
-SHA1 (npm-6.0.0.tar.gz) = 87227738ff424bf51623a6e9fa4b571e46829eba
-RMD160 (npm-6.0.0.tar.gz) = 9af81fc50ba7407c04c03d96edcc8ddd13b43e75
-SHA512 (npm-6.0.0.tar.gz) = 7c5288a268373fa52d5b3d55bd5d40f71459cc2e2f5610b3ecbb61323cbd8b82d6e7ebb5fbea3449de22d4002329895ae3d99f6aceb62dae46875b4669e5cbbd
-Size (npm-6.0.0.tar.gz) = 8551157 bytes
-SHA1 (patch-Makefile) = b5f882d5ab883bfdb527a5802a0f477feef3eb27
+SHA1 (npm-6.0.1.tar.gz) = 16a6ed04bcaf1306c745c4d0c3864ffbda69558c
+RMD160 (npm-6.0.1.tar.gz) = 261a3626464cd5c47420a99f5fa0a5d1b48196f9
+SHA512 (npm-6.0.1.tar.gz) = 91517ba68a13ea7341a2f24b2aafdaf85ba8f2190e1915b729b49f0189fa3551547576d11413ad12bcc4b594df979bc799e2990093da6229eb7047eee1a0ecca
+Size (npm-6.0.1.tar.gz) = 8570368 bytes
+SHA1 (patch-Makefile) = 29b3e9515ee2a45f3b12c116075c00faca73d270
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_generator_make.py) = 291e079fb48caea7501ab864c19ef26672b76bc5
 SHA1 (patch-node__modules_node-gyp_gyp_pylib_gyp_xcode__emulation.py) = 7f9f5cd8aadafd309ba8dfb27f96fe8fa56a8af8
 SHA1 (patch-node__modules_node-gyp_lib_configure.js) = 5cee993904ffeb1497418706e258c2e61bbd847e
diff --git a/lang/npm/patches/patch-Makefile b/lang/npm/patches/patch-Makefile
index a7641392a18..9c605682f20 100644
--- a/lang/npm/patches/patch-Makefile
+++ b/lang/npm/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2018/05/04 09:40:02 adam Exp $
+$NetBSD: patch-Makefile,v 1.2 2018/05/11 09:37:13 adam Exp $
 
 Do not build npm-index.html on rebuild.
 
@@ -9,7 +9,7 @@ Do not build npm-index.html on rebuild.
                 man/man5/npm-global.5
  
 -misc_mandocs = $(shell find doc/misc -name '*.md' \
-+misc_mandocs = $(shell find doc/misc -name '*.md' -not -name 'npm-index.md' \
++misc_mandocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \
                 |sed 's|.md|.7|g' \
                 |sed 's|doc/misc/|man/man7/|g' ) \
                 man/man7/npm-index.7
@@ -18,7 +18,7 @@ Do not build npm-index.html on rebuild.
                    html/doc/files/npm-global.html
  
 -misc_htmldocs = $(shell find doc/misc -name '*.md' \
-+misc_htmldocs = $(shell find doc/misc -name '*.md' -not -name 'npm-index.md' \
++misc_htmldocs = $(shell find doc/misc -name '*.md' \! -name 'npm-index.md' \
                   |sed 's|.md|.html|g' \
                   |sed 's|doc/misc/|html/doc/misc/|g' ) \
                   html/doc/index.html