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

3 files changed, 8 insertions, 16 deletions

diff --git a/npm/.footprint b/npm/.footprint
index 6571188ea..2649c8528 100644
--- a/npm/.footprint
+++ b/npm/.footprint
@@ -97,9 +97,7 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/exec/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/exec/get-workspace-location-msg.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/lifecycle-cmd.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/npm.js
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/search/
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/search/format-package-stream.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/search/package-filter.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/lib/package-url-cmd.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/lib/utils/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/ansi-trim.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/audit-error.js
@@ -120,10 +118,9 @@ 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/exit-handler.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/explain-dep.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/explain-eresolve.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/file-exists.js
 -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/format-search-stream.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.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
@@ -133,7 +130,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/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
--rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/read-package-name.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/lib/utils/read-user-info.js
 -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
@@ -245,6 +241,7 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/link.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/node.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/optional-set.js
+-rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/override-resolves.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/override-set.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/peer-entry-sets.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/place-dep.js
@@ -856,8 +853,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/ip/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/ip/lib/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/ip/lib/ip.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/ip/package.json
-drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/ip/test/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/ip/test/api-test.js
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/is-cidr/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-cidr/index.d.ts
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/is-cidr/index.js
@@ -1615,9 +1610,6 @@ drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/smart-buffer/typings/
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/smart-buffer/typings/utils.d.ts
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/
 drwxr-xr-x	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/agent.d.ts
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/agent.js
--rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/agent.js.map
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/index.d.ts
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/index.js
 -rw-r--r--	root/root	usr/lib/node_modules/npm/node_modules/socks-proxy-agent/dist/index.js.map
diff --git a/npm/.signature b/npm/.signature
index 1274bf42d..85e3baea5 100644
--- a/npm/.signature
+++ b/npm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33nh9c4g+vt5yi5ZOHugc8A5VWEZaqYNMLCG4BtR01zOY4rUkayns8jriBiXtbDv2q1WNMuhZi6QElZg77AHoAM=
-SHA256 (Pkgfile) = 4f8881e5757def4ab67c1e63a2f895e22e8fa4c54e60a62d428072b535b02c6d
-SHA256 (.footprint) = 6d9f2e4007fb5a73fbeefa56ba77784d0a70c6dafa2052940d76e59222b69a8a
-SHA256 (npm-8.9.0.tar.gz) = fb20ddbc820f40a3139aaf924eb11bf530f7811eadee6bf8d015b17fa4ea8283
+RWSagIOpLGJF3xj7kqbPbH24AvHNHPuP8uvs6zUopJSX3PSVJ0hyCe5BNSmDXcsqWuvkGRpbIg8JuX3+DYCX+FrnMNVeGhNKIwI=
+SHA256 (Pkgfile) = 5d91b81d74dded8ae3a9eb90fe2136ed6eee1464d1f94e5dc1a80576009888e2
+SHA256 (.footprint) = e3eecfd717b4d24ddb9e247c3300170af5ff6f196cb4f755e16d0961855d3cfb
+SHA256 (npm-8.10.0.tar.gz) = 44379d57a076ee638ea18269113892d67039cb8f06795e88ce44c37338695d65
 SHA256 (destdir.patch) = b74ee19a9412025067c9d0b5aa5946a651a7bc0dedab4ae147b3e5d1fb569462
diff --git a/npm/Pkgfile b/npm/Pkgfile
index 515977224..68834c222 100644
--- a/npm/Pkgfile
+++ b/npm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: nodejs
 
 name=npm
-version=8.9.0
+version=8.10.0
 release=1
 source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz
   destdir.patch)