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

3 files changed, 25 insertions, 46 deletions

diff --git a/npm/.footprint b/npm/.footprint
index 1c265ea8c..70c5f5270 100644
--- a/npm/.footprint
+++ b/npm/.footprint
@@ -169,6 +169,7 @@ lrwxrwxrwx	root/root	usr/lib/node_modules/npm/node_modules/.bin/rimraf -> ../rim
 lrwxrwxrwx	root/root	usr/lib/node_modules/npm/node_modules/.bin/semver -> ../semver/bin/semver.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@gar/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@gar/promisify/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@gar/promisify/LICENSE.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@gar/promisify/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@gar/promisify/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@isaacs/
@@ -306,6 +307,9 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/lib/which.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/bundle/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/bundle/main.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/bundle/main.mjs
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/node_modules/lru-cache/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/git/package.json
@@ -316,6 +320,15 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspace
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/LICENSE.md
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/lib/index.js
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/brace-expansion/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/brace-expansion/index.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/brace-expansion/package.json
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/lib/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/lib/path.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/minimatch.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/node_modules/minimatch/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/map-workspaces/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/metavuln-calculator/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/metavuln-calculator/lib/
@@ -917,11 +930,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/is-lambda/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-lambda/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-lambda/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-lambda/test.js
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/is-typedarray/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-typedarray/LICENSE.md
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-typedarray/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-typedarray/package.json
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-typedarray/test.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/isexe/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/isexe/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/isexe/mode.js
@@ -1048,6 +1056,9 @@ 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/remote.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/
+drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/bundle/
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/bundle/main.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/bundle/main.mjs
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/node_modules/lru-cache/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/make-fetch-happen/package.json
@@ -1058,7 +1069,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/minipass-collect/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/minipass-collect/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/minipass-collect/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/minipass-fetch/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/minipass-fetch/index.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/minipass-fetch/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/minipass-fetch/lib/abort-error.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/minipass-fetch/lib/blob.js
@@ -1133,12 +1143,13 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/.github/work
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/.github/workflows/visual-studio.yml
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/CHANGELOG.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/CONTRIBUTING.md
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/SECURITY.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/bin/
 -rwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Common-issues.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Error-pre-versions-of-node-cannot-be-installed.md
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Force-npm-to-use-global-node-gyp.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Home.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Linking-to-OpenSSL.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/docs/Updating-npm-bundled-node-gyp.md
@@ -1250,37 +1261,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/lib/util.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/macOS_Catalina.md
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/macOS_Catalina_acid_test.sh
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.d.ts
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/dist/index.js.map
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/@tootallnate/once/package.json
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.d.ts
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/agent.js.map
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.d.ts
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/dist/index.js.map
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/http-proxy-agent/package.json
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/agent.js
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/entry.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/errors.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/key.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/policy.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/fetch.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/options.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/lib/remote.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/node_modules/make-fetch-happen/package.json
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/src/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/node-gyp/src/win_delay_load_hook.cc
@@ -1817,9 +1797,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/treeverse/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/treeverse/lib/depth-descent.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/treeverse/lib/depth.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/treeverse/package.json
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/typedarray-to-buffer/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/typedarray-to-buffer/index.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/typedarray-to-buffer/package.json
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/unique-filename/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/unique-filename/coverage/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/unique-filename/coverage/__root__/
diff --git a/npm/.signature b/npm/.signature
index 9d99fe5ef..42fe6cb19 100644
--- a/npm/.signature
+++ b/npm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32DoRSYfG3XBPoR83/ef1+AxrwkUGy36FDXMgKqcNLRjF3piwgEdj3s8176E38Iog4tPXB88EnOhlQK3SjFHogE=
-SHA256 (Pkgfile) = db541237eba9215c2b6d33b58401aaddf33c598bed1bc40cbaad935b1543354b
-SHA256 (.footprint) = 9280c8769077d2c62fc851fbb1db48e4be2f0c8af922b1d2f28fc7fd55e559c3
-SHA256 (npm-8.5.2.tar.gz) = c78f4df33bf4af0dc7ff6962f56cdcc4553429cafd2bb0a4b061d5a901fe2d9a
+RWSagIOpLGJF3x7eym+zLz50dL+AOSp6MLBm5XUL/nZgjZ1ACxXNN417OmNZ6GNEGDXvqq4joq66fsAnonl5EjhW2oLb3izJZw8=
+SHA256 (Pkgfile) = c977ea843937002dc2285ae5f7e539ed025cb902c234fdae6b4164c22a6551bd
+SHA256 (.footprint) = 1af0748c151eff910f6f79e4bc8c917d0cbd5d3998ba6dc0bc0d22924cbb3c89
+SHA256 (npm-8.5.3.tar.gz) = 1b9055f4500d871615a0413b17a37bef5ae57356e2f84ad85a5dcf9b5440925d
 SHA256 (destdir.patch) = b74ee19a9412025067c9d0b5aa5946a651a7bc0dedab4ae147b3e5d1fb569462
diff --git a/npm/Pkgfile b/npm/Pkgfile
index fc4dab113..a33dc15e3 100644
--- a/npm/Pkgfile
+++ b/npm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: nodejs
 
 name=npm
-version=8.5.2
+version=8.5.3
 release=1
 source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz
   destdir.patch)
@@ -12,6 +12,8 @@ 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/:*$//')"
+
   export NPM_CONFIG_USERCONFIG=$SRC/.npm
   export NPM_CONFIG_CACHE=$SRC/.npm/cache
   export GATSBY_TELEMETRY_DISABLED="1"