Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 29 insertions, 26 deletions

diff --git a/npm/.footprint b/npm/.footprint
index 51f04657f..24a1fc234 100644
--- a/npm/.footprint
+++ b/npm/.footprint
@@ -114,7 +114,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/utils/config/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/config/describe-all.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/config/flatten.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/config/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/deref-command.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/did-you-mean.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/display.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/error-message.js
@@ -125,15 +124,12 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/utils/config/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/format-bytes.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/get-identity.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/hosted-git-info-from-manifest.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/is-windows-bash.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/is-windows-shell.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/is-windows.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/log-file.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/log-shim.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/npm-usage.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/open-url.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/otplease.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/path.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/ping.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/pulse-till-done.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/queryable.js
@@ -142,14 +138,10 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/utils/config/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/reify-finish.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/reify-output.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/replace-info.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/split-package-names.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/tar.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/timers.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/unsupported.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/update-notifier.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/usage.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/validate-lockfile.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/with-chown-sync.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/workspaces/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/workspaces/get-workspaces.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/
@@ -272,6 +264,7 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common/file-url-to-path/polyfill.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common/get-options.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common/node.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common/owner-sync.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/common/owner.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/copy-file.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/cp/
@@ -287,6 +280,8 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/mkdir/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/rm/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/rm/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/rm/polyfill.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/with-owner-sync.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/with-owner.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/with-temp-dir.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/lib/write-file.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/fs/package.json
@@ -489,10 +484,8 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/brace-expansion/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/brace-expansion/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/brace-expansion/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/builtins/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/builtins/History.md
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/builtins/builtins.json
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/builtins/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/builtins/package.json
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/builtins/test.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/cacache/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/cacache/LICENSE.md
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/cacache/lib/
@@ -930,8 +923,10 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/jsonparse/test/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/jsonparse/test/unvalid.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/jsonparse/test/utf8.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/index.d.ts
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/index.mjs
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/index.tests.ts
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/just-diff-apply/rollup.config.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/just-diff/
@@ -1018,6 +1013,7 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/cache/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/cache/key.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/cache/policy.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/dns.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/fetch.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/lib/options.js
@@ -1326,10 +1322,10 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/auth.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/check-response.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/clean-url.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/default-opts.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/errors.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/lib/silentlog.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-registry-fetch/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/npm-user-validate/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/npm-user-validate/npm-user-validate.js
@@ -1788,10 +1784,9 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-license/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-license/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/index.js
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/lib/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/lib/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/package.json
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/test/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/validate-npm-package-name/test/index.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/walk-up-path/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/walk-up-path/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/walk-up-path/package.json
diff --git a/npm/.signature b/npm/.signature
index 920021a5c..344210d10 100644
--- a/npm/.signature
+++ b/npm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/3u98Y3AJ0mkLC+tFnB4EnV9Q8YNQBWR2YKVnXgkVKmKXOc5HEHsuAQVOUKX1rkgcBjvAA8b5sRx7Z3vwPTxQM=
-SHA256 (Pkgfile) = 71aaec884fc58ed4b91c42336594834ff85c28f428ba752219e603f6875b3f9c
-SHA256 (.footprint) = c1acd385ee09c195a54c77cfaafaa35f7f22fad9fab196622dbff7db51300cb2
-SHA256 (npm-8.5.5.tar.gz) = eb06a2bfaa9a90f9762c936949e21f541c269d4d568d3c6173bdf5332d974c95
+RWSagIOpLGJF31R9MhL/XUFWjAZMzN6VWMCocgnOoAaPTt04MAQUrHpp8MJrmKiISWHo1mIf1zJNczaKYvZZu5GVrjSnsiYnfgA=
+SHA256 (Pkgfile) = bd46e95f09f6d3c9e9a0dda6498bdf641b6807b1fd7c42982c9288cea338554a
+SHA256 (.footprint) = 3784d9f8614b2d39e1162faa27d1478d130bf647a111ed5bd1918bf673fbc128
+SHA256 (npm-8.6.0.tar.gz) = 693a8cc8fede57d4aa84b3d9d6938ab3b84aa42cb771e6d029e45371bfc3a1c8
 SHA256 (destdir.patch) = b74ee19a9412025067c9d0b5aa5946a651a7bc0dedab4ae147b3e5d1fb569462
diff --git a/npm/Pkgfile b/npm/Pkgfile
index f1c136389..c7cb74464 100644
--- a/npm/Pkgfile
+++ b/npm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: nodejs
 
 name=npm
-version=8.5.5
+version=8.6.0
 release=1
 source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz
   destdir.patch)
@@ -12,19 +12,26 @@ source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz
 build() {
   cd cli-$version
 
-  prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
+  prt-get isinst ccache && \
+    PATH="$(echo ${PATH} | \
+    awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
 
-  export NPM_CONFIG_USERCONFIG=$SRC/.npm
-  export NPM_CONFIG_CACHE=$SRC/.npm/cache
+  export npm_config_cache="$SRC/.npm/cache"
+  export npm_config_userconfig="$SRC/.npm/cache"
   export GATSBY_TELEMETRY_DISABLED="1"
 
   # fix some build issues
-  node bin/npm-cli.js install cmark-gfm --no-global --no-timing --no-save
+  # starting with 8.6.0, `make mandocs` would remove the node_modules dir
+  awk -i inplace \
+    '/node bin\/npm-cli.js run resetdeps/ gsub(/resetdeps/, "dumpconf")' \
+    Makefile
+  node bin/npm-cli.js install marked-man --no-global --no-timing --no-save
   patch -Np1 -i $SRC/destdir.patch
 
   make mandocs
   NODE_PATH=/usr/lib/node_modules node bin/npm-cli.js pack
-  NODE_PATH=/usr/lib/node_modules DESTDIR=$PKG node bin/npm-cli.js install -g -f npm-$version.tgz
+  NODE_PATH=/usr/lib/node_modules DESTDIR=$PKG node bin/npm-cli.js \
+    install -g -f npm-$version.tgz
 
   mkdir -p $PKG/usr/share
   mv $PKG/usr/lib/node_modules/npm/man $PKG/usr/share/
@@ -36,5 +43,6 @@ build() {
     -iname "CHANGELOG" -o \
     -iname "AUTHORS*" \)\
     -exec rm '{}' \+
-  rm -r $PKG/usr/lib/node_modules/npm/docs #$PKG/usr/lib/node_modules/npm/changelogs
+  rm -r $PKG/usr/lib/node_modules/npm/docs
+  #$PKG/usr/lib/node_modules/npm/changelogs
 }