Update to the original patch including a fix for ppc64 from gkoehler@
ok?
On Wed Sep 20, 2023 at 12:14 AM CEST, Volker Schlecht wrote:
> * Updates lang/node to the latest revision of the LTS release branch.
> * Use SITES
>
> Node dropped the node-gyp binary in this release, which has been deprecated
> for
> a while. As far as I can tell, the only port that's actually building a node
> extension is lang/node itself, so this shouldn't cause any fallout.
>
> www/mozilla-firefox, devel/swig and devel/yarn still build and run. I gave up
> on
> www/chromium half-way through the build, but honestly see no reason why it
> should
> break either.
>
> Built and tested on amd64 and arm64.
>
> ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile 15 Aug 2023 13:46:30 -0000 1.126
+++ Makefile 23 Sep 2023 12:49:30 -0000
@@ -5,17 +5,17 @@ USE_WXNEEDED = Yes
COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine
-NODE_VERSION = v18.17.1
+NODE_VERSION = v18.18.0
PLEDGE_VER = 1.1.3
-DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 \
- ${DISTNAME}-headers.tar.gz \
+DISTFILES = ${DISTNAME}-headers.tar.gz \
${DISTNAME}.tar.xz
+DISTFILES.pledge = node-pledge-{}${PLEDGE_VER}.tar.gz
DISTNAME = node-${NODE_VERSION}
PKGNAME = ${DISTNAME:S/v//g}
EPOCH = 0
-MASTER_SITES0 = https://github.com/qbit/node-pledge/archive/
+SITES.pledge = https://github.com/qbit/node-pledge/archive/
CATEGORIES = lang devel
@@ -98,8 +98,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/node
${INSTALL_DATA} ${FULLDISTDIR}/${DISTNAME}-headers.tar.gz \
${PREFIX}/share/node/${DISTNAME}-headers.tar.gz
- ln -fs ${TRUEPREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \
- ${PREFIX}/bin/node-gyp;
rm -r ${PREFIX}/lib/node_modules/npm/node_modules/node-pledge/build/node_gyp_bins
cd ${PREFIX}/lib/node_modules/npm/node_modules && for x in *; do \
mv $$x ../..; \
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.71
diff -u -p -r1.71 distinfo
--- distinfo 15 Aug 2023 13:46:31 -0000 1.71
+++ distinfo 23 Sep 2023 12:49:30 -0000
@@ -1,6 +1,6 @@
SHA256 (node-pledge-1.1.3.tar.gz) = fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU=
-SHA256 (node-v18.17.1-headers.tar.gz) = BO5D9bJyADec9TH5VNTeKJtIcMNhYcSNQn+nQb4+Z/s=
-SHA256 (node-v18.17.1.tar.xz) = 8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo=
+SHA256 (node-v18.18.0-headers.tar.gz) = 3NwDNUJuPiT44f9p1t3SFyw+Q5bobb9LeiyXPXLeR4U=
+SHA256 (node-v18.18.0.tar.xz) = 5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A=
SIZE (node-pledge-1.1.3.tar.gz) = 3167
-SIZE (node-v18.17.1-headers.tar.gz) = 8576937
-SIZE (node-v18.17.1.tar.xz) = 40788836
+SIZE (node-v18.18.0-headers.tar.gz) = 8712286
+SIZE (node-v18.18.0.tar.xz) = 40813264
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 patch-Makefile
--- patches/patch-Makefile 4 May 2023 12:25:23 -0000 1.18
+++ patches/patch-Makefile 23 Sep 2023 12:49:30 -0000
@@ -16,7 +16,7 @@ Index: Makefile
build-addons: | $(NODE_EXE) test/addons/.buildstamp
+
+build-pledge: $(NODE_EXE)
-+ $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
++ $(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp.js rebuild \
+ --directory="deps/npm/node_modules/node-pledge" \
+ --nodedir="$(shell pwd)" && \
+ $(RM) -rf deps/npm/node_modules/node-pledge/build/Release/{.deps,../Makefile,obj.target}
Index: patches/patch-common_gypi
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-common_gypi,v
retrieving revision 1.29
diff -u -p -r1.29 patch-common_gypi
--- patches/patch-common_gypi 7 Jul 2023 10:44:15 -0000 1.29
+++ patches/patch-common_gypi 23 Sep 2023 12:49:30 -0000
@@ -18,14 +18,23 @@ Index: common.gypi
+ , '-Wl,-rpath,${EOPENSSL_LIB}'
+ ],
}],
- ],
- 'conditions': [
+ ['_toolset=="host"', {
+ 'conditions': [
@@ -426,7 +427,7 @@
- 'ldflags': [ '-m32' ],
- }],
- [ 'target_arch=="ppc64" and OS not in "aix os400"', {
-- 'cflags': [ '-m64', '-mminimal-toc' ],
-+ 'cflags': [ '-m64' ],
- 'ldflags': [ '-m64' ],
- }],
- [ 'target_arch=="s390x" and OS=="linux"', {
+ 'ldflags': [ '-m32' ],
+ }],
+ [ 'host_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'host_arch=="s390x" and OS=="linux"', {
+@@ -450,7 +451,7 @@
+ 'ldflags': [ '-m32' ],
+ }],
+ [ 'target_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'target_arch=="s390x" and OS=="linux"', {
Index: patches/patch-deps_npm_bin_node-gyp-bin_node-gyp
===================================================================
RCS file: patches/patch-deps_npm_bin_node-gyp-bin_node-gyp
diff -N patches/patch-deps_npm_bin_node-gyp-bin_node-gyp
--- patches/patch-deps_npm_bin_node-gyp-bin_node-gyp 11 Mar 2022 19:29:08 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: deps/npm/bin/node-gyp-bin/node-gyp
---- deps/npm/bin/node-gyp-bin/node-gyp.orig
-+++ deps/npm/bin/node-gyp-bin/node-gyp
-@@ -1,6 +1,5 @@
- #!/usr/bin/env sh
--if [ "x$npm_config_node_gyp" = "x" ]; then
-- node "`dirname "$0"`/../../node_modules/node-gyp/bin/node-gyp.js" "$@"
--else
-- "$npm_config_node_gyp" "$@"
--fi
-+
-+# stop trying to be cute and just call node-gyp with the full path
-+
-+node /usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$@"
Index: patches/patch-deps_npm_node_modules_node-gyp_lib_install_js
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js,v
retrieving revision 1.15
diff -u -p -r1.15 patch-deps_npm_node_modules_node-gyp_lib_install_js
--- patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 11 Mar 2022 19:29:08 -0000 1.15
+++ patches/patch-deps_npm_node_modules_node-gyp_lib_install_js 23 Sep 2023 12:49:30 -0000
@@ -1,11 +1,12 @@
---- deps/npm/node_modules/node-gyp/lib/install.js.orig Sat Jan 8 14:24:19 2022
-+++ deps/npm/node_modules/node-gyp/lib/install.js Sat Jan 8 14:26:57 2022
-@@ -117,7 +117,7 @@ async function install (fs, gyp, argv) {
+Index: deps/npm/node_modules/node-gyp/lib/install.js
+--- deps/npm/node_modules/node-gyp/lib/install.js.orig
++++ deps/npm/node_modules/node-gyp/lib/install.js
+@@ -177,7 +177,7 @@ async function install (fs, gyp, argv) {
}
// now download the node tarball
- const tarPath = gyp.opts.tarball
+ const tarPath = gyp.opts.tarball || '${LOCALBASE}/share/node/node-${NODE_VERSION}-headers.tar.gz'
+ let extractErrors = false
let extractCount = 0
const contentShasums = {}
- const expectShasums = {}
Index: patches/patch-include_node_common_gypi
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-include_node_common_gypi,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_node_common_gypi
--- patches/patch-include_node_common_gypi 4 May 2023 12:25:23 -0000 1.3
+++ patches/patch-include_node_common_gypi 23 Sep 2023 12:49:30 -0000
@@ -10,11 +10,20 @@ Index: include/node/common.gypi
['enable_lto=="true"', {
'cflags': ['<(lto)'],
@@ -426,7 +425,7 @@
- 'ldflags': [ '-m32' ],
- }],
- [ 'target_arch=="ppc64" and OS not in "aix os400"', {
-- 'cflags': [ '-m64', '-mminimal-toc' ],
-+ 'cflags': [ '-m64' ],
- 'ldflags': [ '-m64' ],
- }],
- [ 'target_arch=="s390x" and OS=="linux"', {
+ 'ldflags': [ '-m32' ],
+ }],
+ [ 'host_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'host_arch=="s390x" and OS=="linux"', {
+@@ -450,7 +449,7 @@
+ 'ldflags': [ '-m32' ],
+ }],
+ [ 'target_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'target_arch=="s390x" and OS=="linux"', {
Index: patches/patch-lib_net_js
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-lib_net_js,v
retrieving revision 1.8
diff -u -p -r1.8 patch-lib_net_js
--- patches/patch-lib_net_js 15 Aug 2023 13:46:36 -0000 1.8
+++ patches/patch-lib_net_js 23 Sep 2023 12:49:30 -0000
@@ -13,7 +13,7 @@ for "any address" but that's not really
Index: lib/net.js
--- lib/net.js.orig
+++ lib/net.js
-@@ -1713,22 +1713,12 @@ function setupListenHandle(address, port, addressType,
+@@ -1779,22 +1779,12 @@ function setupListenHandle(address, port, addressType,
let rval = null;
Index: patches/patch-src_env_cc
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-src_env_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_env_cc
--- patches/patch-src_env_cc 15 Aug 2023 13:46:36 -0000 1.6
+++ patches/patch-src_env_cc 23 Sep 2023 12:49:30 -0000
@@ -1,7 +1,7 @@
Index: src/env.cc
--- src/env.cc.orig
+++ src/env.cc
-@@ -614,29 +614,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
+@@ -612,29 +612,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
}
std::string GetExecPath(const std::vector<std::string>& argv) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/node/pkg/PLIST,v
retrieving revision 1.57
diff -u -p -r1.57 PLIST
--- pkg/PLIST 15 Aug 2023 13:46:38 -0000 1.57
+++ pkg/PLIST 23 Sep 2023 12:49:30 -0000
@@ -1,6 +1,5 @@
bin/corepack
@bin bin/node
-bin/node-gyp
bin/npm
bin/npx
include/node/
@@ -96,11 +95,6 @@ lib/node_modules/@colors/colors/package.
lib/node_modules/@colors/colors/safe.js
lib/node_modules/@colors/colors/themes/
lib/node_modules/@colors/colors/themes/generic-logging.js
-lib/node_modules/@gar/
-lib/node_modules/@gar/promisify/
-lib/node_modules/@gar/promisify/LICENSE.md
-lib/node_modules/@gar/promisify/index.js
-lib/node_modules/@gar/promisify/package.json
lib/node_modules/@isaacs/
lib/node_modules/@isaacs/cliui/
lib/node_modules/@isaacs/cliui/LICENSE.txt
@@ -214,6 +208,10 @@ lib/node_modules/@npmcli/config/
lib/node_modules/@npmcli/config/LICENSE
lib/node_modules/@npmcli/config/README.md
lib/node_modules/@npmcli/config/lib/
+lib/node_modules/@npmcli/config/lib/definitions/
+lib/node_modules/@npmcli/config/lib/definitions/definition.js
+lib/node_modules/@npmcli/config/lib/definitions/definitions.js
+lib/node_modules/@npmcli/config/lib/definitions/index.js
lib/node_modules/@npmcli/config/lib/env-replace.js
lib/node_modules/@npmcli/config/lib/errors.js
lib/node_modules/@npmcli/config/lib/index.js
@@ -281,11 +279,6 @@ lib/node_modules/@npmcli/metavuln-calcul
lib/node_modules/@npmcli/metavuln-calculator/lib/hash.js
lib/node_modules/@npmcli/metavuln-calculator/lib/index.js
lib/node_modules/@npmcli/metavuln-calculator/package.json
-lib/node_modules/@npmcli/move-file/
-lib/node_modules/@npmcli/move-file/LICENSE.md
-lib/node_modules/@npmcli/move-file/lib/
-lib/node_modules/@npmcli/move-file/lib/index.js
-lib/node_modules/@npmcli/move-file/package.json
lib/node_modules/@npmcli/name-from-folder/
lib/node_modules/@npmcli/name-from-folder/LICENSE
lib/node_modules/@npmcli/name-from-folder/lib/
@@ -368,6 +361,17 @@ lib/node_modules/@sigstore/protobuf-spec
lib/node_modules/@sigstore/protobuf-specs/dist/__generated__/sigstore_verification.js
lib/node_modules/@sigstore/protobuf-specs/dist/index.js
lib/node_modules/@sigstore/protobuf-specs/package.json
+lib/node_modules/@sigstore/tuf/
+lib/node_modules/@sigstore/tuf/LICENSE
+lib/node_modules/@sigstore/tuf/dist/
+lib/node_modules/@sigstore/tuf/dist/appdata.js
+lib/node_modules/@sigstore/tuf/dist/client.js
+lib/node_modules/@sigstore/tuf/dist/error.js
+lib/node_modules/@sigstore/tuf/dist/index.js
+lib/node_modules/@sigstore/tuf/dist/target.js
+lib/node_modules/@sigstore/tuf/package.json
+lib/node_modules/@sigstore/tuf/store/
+lib/node_modules/@sigstore/tuf/store/public-good-instance-root.json
lib/node_modules/@tootallnate/
lib/node_modules/@tootallnate/once/
lib/node_modules/@tootallnate/once/LICENSE
@@ -540,8 +544,13 @@ lib/node_modules/chalk/license
lib/node_modules/chalk/package.json
lib/node_modules/chalk/source/
lib/node_modules/chalk/source/index.js
-lib/node_modules/chalk/source/templates.js
-lib/node_modules/chalk/source/util.js
+lib/node_modules/chalk/source/utilities.js
+lib/node_modules/chalk/source/vendor/
+lib/node_modules/chalk/source/vendor/ansi-styles/
+lib/node_modules/chalk/source/vendor/ansi-styles/index.js
+lib/node_modules/chalk/source/vendor/supports-color/
+lib/node_modules/chalk/source/vendor/supports-color/browser.js
+lib/node_modules/chalk/source/vendor/supports-color/index.js
lib/node_modules/chownr/
lib/node_modules/chownr/LICENSE
lib/node_modules/chownr/chownr.js
@@ -841,6 +850,26 @@ lib/node_modules/events/tests/set-max-li
lib/node_modules/events/tests/special-event-names.js
lib/node_modules/events/tests/subclass.js
lib/node_modules/events/tests/symbols.js
+lib/node_modules/exponential-backoff/
+lib/node_modules/exponential-backoff/LICENSE
+lib/node_modules/exponential-backoff/dist/
+lib/node_modules/exponential-backoff/dist/backoff.js
+lib/node_modules/exponential-backoff/dist/delay/
+lib/node_modules/exponential-backoff/dist/delay/always/
+lib/node_modules/exponential-backoff/dist/delay/always/always.delay.js
+lib/node_modules/exponential-backoff/dist/delay/delay.base.js
+lib/node_modules/exponential-backoff/dist/delay/delay.factory.js
+lib/node_modules/exponential-backoff/dist/delay/delay.interface.js
+lib/node_modules/exponential-backoff/dist/delay/skip-first/
+lib/node_modules/exponential-backoff/dist/delay/skip-first/skip-first.delay.js
+lib/node_modules/exponential-backoff/dist/jitter/
+lib/node_modules/exponential-backoff/dist/jitter/full/
+lib/node_modules/exponential-backoff/dist/jitter/full/full.jitter.js
+lib/node_modules/exponential-backoff/dist/jitter/jitter.factory.js
+lib/node_modules/exponential-backoff/dist/jitter/no/
+lib/node_modules/exponential-backoff/dist/jitter/no/no.jitter.js
+lib/node_modules/exponential-backoff/dist/options.js
+lib/node_modules/exponential-backoff/package.json
lib/node_modules/fastest-levenshtein/
lib/node_modules/fastest-levenshtein/LICENSE.md
lib/node_modules/fastest-levenshtein/bench.js
@@ -975,10 +1004,6 @@ lib/node_modules/graceful-fs/legacy-stre
lib/node_modules/graceful-fs/package.json
lib/node_modules/graceful-fs/polyfills.js
lib/node_modules/has/
-lib/node_modules/has-flag/
-lib/node_modules/has-flag/index.js
-lib/node_modules/has-flag/license
-lib/node_modules/has-flag/package.json
lib/node_modules/has-unicode/
lib/node_modules/has-unicode/LICENSE
lib/node_modules/has-unicode/index.js
@@ -1058,10 +1083,6 @@ lib/node_modules/indent-string/
lib/node_modules/indent-string/index.js
lib/node_modules/indent-string/license
lib/node_modules/indent-string/package.json
-lib/node_modules/infer-owner/
-lib/node_modules/infer-owner/LICENSE
-lib/node_modules/infer-owner/index.js
-lib/node_modules/infer-owner/package.json
lib/node_modules/inflight/
lib/node_modules/inflight/LICENSE
lib/node_modules/inflight/inflight.js
@@ -1570,33 +1591,6 @@ lib/node_modules/node-gyp/lib/util.js
lib/node_modules/node-gyp/macOS_Catalina.md
lib/node_modules/node-gyp/macOS_Catalina_acid_test.sh
lib/node_modules/node-gyp/node_modules/
-lib/node_modules/node-gyp/node_modules/@npmcli/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/LICENSE.md
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/common/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/common/get-options.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/common/node.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/common/owner-sync.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/common/owner.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/copy-file.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/cp/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/cp/LICENSE
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/cp/index.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/cp/polyfill.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/errors.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/fs.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/index.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/mkdir.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/mkdtemp.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/rm/
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/rm/index.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/rm/polyfill.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/with-owner-sync.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/with-owner.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/with-temp-dir.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/lib/write-file.js
-lib/node_modules/node-gyp/node_modules/@npmcli/fs/package.json
lib/node_modules/node-gyp/node_modules/abbrev/
lib/node_modules/node-gyp/node_modules/abbrev/LICENSE
lib/node_modules/node-gyp/node_modules/abbrev/abbrev.js
@@ -1614,48 +1608,6 @@ lib/node_modules/node-gyp/node_modules/b
lib/node_modules/node-gyp/node_modules/brace-expansion/LICENSE
lib/node_modules/node-gyp/node_modules/brace-expansion/index.js
lib/node_modules/node-gyp/node_modules/brace-expansion/package.json
-lib/node_modules/node-gyp/node_modules/cacache/
-lib/node_modules/node-gyp/node_modules/cacache/LICENSE.md
-lib/node_modules/node-gyp/node_modules/cacache/lib/
-lib/node_modules/node-gyp/node_modules/cacache/lib/content/
-lib/node_modules/node-gyp/node_modules/cacache/lib/content/path.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/content/read.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/content/rm.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/content/write.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/entry-index.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/get.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/index.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/memoization.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/put.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/rm.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/util/
-lib/node_modules/node-gyp/node_modules/cacache/lib/util/fix-owner.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/util/hash-to-segments.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/util/move-file.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/util/tmp.js
-lib/node_modules/node-gyp/node_modules/cacache/lib/verify.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion/
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion/LICENSE
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion/index.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion/package.json
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/LICENSE
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/common.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/glob.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/package.json
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/glob/sync.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/LICENSE
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/lib/
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/lib/path.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/minimatch.js
-lib/node_modules/node-gyp/node_modules/cacache/node_modules/minimatch/package.json
-lib/node_modules/node-gyp/node_modules/cacache/package.json
-lib/node_modules/node-gyp/node_modules/fs-minipass/
-lib/node_modules/node-gyp/node_modules/fs-minipass/LICENSE
-lib/node_modules/node-gyp/node_modules/fs-minipass/index.js
-lib/node_modules/node-gyp/node_modules/fs-minipass/package.json
lib/node_modules/node-gyp/node_modules/gauge/
lib/node_modules/node-gyp/node_modules/gauge/LICENSE.md
lib/node_modules/node-gyp/node_modules/gauge/lib/
@@ -1681,43 +1633,10 @@ lib/node_modules/node-gyp/node_modules/g
lib/node_modules/node-gyp/node_modules/glob/glob.js
lib/node_modules/node-gyp/node_modules/glob/package.json
lib/node_modules/node-gyp/node_modules/glob/sync.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/LICENSE
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/agent.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/entry.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/errors.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/index.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/key.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/cache/policy.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/dns.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/fetch.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/index.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/options.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/pipeline.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/lib/remote.js
-lib/node_modules/node-gyp/node_modules/make-fetch-happen/package.json
lib/node_modules/node-gyp/node_modules/minimatch/
lib/node_modules/node-gyp/node_modules/minimatch/LICENSE
lib/node_modules/node-gyp/node_modules/minimatch/minimatch.js
lib/node_modules/node-gyp/node_modules/minimatch/package.json
-lib/node_modules/node-gyp/node_modules/minipass/
-lib/node_modules/node-gyp/node_modules/minipass-fetch/
-lib/node_modules/node-gyp/node_modules/minipass-fetch/LICENSE
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/abort-error.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/blob.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/body.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/fetch-error.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/headers.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/index.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/request.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/lib/response.js
-lib/node_modules/node-gyp/node_modules/minipass-fetch/package.json
-lib/node_modules/node-gyp/node_modules/minipass/LICENSE
-lib/node_modules/node-gyp/node_modules/minipass/index.js
-lib/node_modules/node-gyp/node_modules/minipass/package.json
lib/node_modules/node-gyp/node_modules/nopt/
lib/node_modules/node-gyp/node_modules/nopt/LICENSE
lib/node_modules/node-gyp/node_modules/nopt/README.md
@@ -1764,21 +1683,6 @@ lib/node_modules/node-gyp/node_modules/s
lib/node_modules/node-gyp/node_modules/signal-exit/index.js
lib/node_modules/node-gyp/node_modules/signal-exit/package.json
lib/node_modules/node-gyp/node_modules/signal-exit/signals.js
-lib/node_modules/node-gyp/node_modules/ssri/
-lib/node_modules/node-gyp/node_modules/ssri/LICENSE.md
-lib/node_modules/node-gyp/node_modules/ssri/lib/
-lib/node_modules/node-gyp/node_modules/ssri/lib/index.js
-lib/node_modules/node-gyp/node_modules/ssri/package.json
-lib/node_modules/node-gyp/node_modules/unique-filename/
-lib/node_modules/node-gyp/node_modules/unique-filename/LICENSE
-lib/node_modules/node-gyp/node_modules/unique-filename/lib/
-lib/node_modules/node-gyp/node_modules/unique-filename/lib/index.js
-lib/node_modules/node-gyp/node_modules/unique-filename/package.json
-lib/node_modules/node-gyp/node_modules/unique-slug/
-lib/node_modules/node-gyp/node_modules/unique-slug/LICENSE
-lib/node_modules/node-gyp/node_modules/unique-slug/lib/
-lib/node_modules/node-gyp/node_modules/unique-slug/lib/index.js
-lib/node_modules/node-gyp/node_modules/unique-slug/package.json
lib/node_modules/node-gyp/node_modules/which/
lib/node_modules/node-gyp/node_modules/which/LICENSE
lib/node_modules/node-gyp/node_modules/which/README.md
@@ -1899,15 +1803,14 @@ lib/node_modules/npm/.npmrc
lib/node_modules/npm/LICENSE
lib/node_modules/npm/README.md
lib/node_modules/npm/bin/
-lib/node_modules/npm/bin/node-gyp-bin/
-lib/node_modules/npm/bin/node-gyp-bin/node-gyp
-lib/node_modules/npm/bin/node-gyp-bin/node-gyp.cmd
lib/node_modules/npm/bin/npm
lib/node_modules/npm/bin/npm-cli.js
lib/node_modules/npm/bin/npm.cmd
+lib/node_modules/npm/bin/npm.ps1
lib/node_modules/npm/bin/npx
lib/node_modules/npm/bin/npx-cli.js
lib/node_modules/npm/bin/npx.cmd
+lib/node_modules/npm/bin/npx.ps1
lib/node_modules/npm/docs/
lib/node_modules/npm/docs/README.md
lib/node_modules/npm/docs/content/
@@ -2086,6 +1989,7 @@ lib/node_modules/npm/index.js
lib/node_modules/npm/lib/
lib/node_modules/npm/lib/arborist-cmd.js
lib/node_modules/npm/lib/base-command.js
+lib/node_modules/npm/lib/cli-entry.js
lib/node_modules/npm/lib/cli.js
lib/node_modules/npm/lib/commands/
lib/node_modules/npm/lib/commands/access.js
@@ -2154,6 +2058,8 @@ lib/node_modules/npm/lib/commands/update
lib/node_modules/npm/lib/commands/version.js
lib/node_modules/npm/lib/commands/view.js
lib/node_modules/npm/lib/commands/whoami.js
+lib/node_modules/npm/lib/es6/
+lib/node_modules/npm/lib/es6/validate-engines.js
lib/node_modules/npm/lib/lifecycle-cmd.js
lib/node_modules/npm/lib/npm.js
lib/node_modules/npm/lib/package-url-cmd.js
@@ -2167,10 +2073,6 @@ lib/node_modules/npm/lib/utils/completio
lib/node_modules/npm/lib/utils/completion.sh
lib/node_modules/npm/lib/utils/completion/installed-deep.js
lib/node_modules/npm/lib/utils/completion/installed-shallow.js
-lib/node_modules/npm/lib/utils/config/
-lib/node_modules/npm/lib/utils/config/definition.js
-lib/node_modules/npm/lib/utils/config/definitions.js
-lib/node_modules/npm/lib/utils/config/index.js
lib/node_modules/npm/lib/utils/did-you-mean.js
lib/node_modules/npm/lib/utils/display.js
lib/node_modules/npm/lib/utils/error-message.js
@@ -2292,7 +2194,6 @@ lib/node_modules/npm/man/man7/
@man lib/node_modules/npm/man/man7/workspaces.7
lib/node_modules/npm/node_modules/
lib/node_modules/npm/node_modules/@colors
-lib/node_modules/npm/node_modules/@gar
lib/node_modules/npm/node_modules/@isaacs
lib/node_modules/npm/node_modules/@npmcli
lib/node_modules/npm/node_modules/@pkgjs
@@ -2347,6 +2248,7 @@ lib/node_modules/npm/node_modules/env-pa
lib/node_modules/npm/node_modules/err-code
lib/node_modules/npm/node_modules/event-target-shim
lib/node_modules/npm/node_modules/events
+lib/node_modules/npm/node_modules/exponential-backoff
lib/node_modules/npm/node_modules/fastest-levenshtein
lib/node_modules/npm/node_modules/foreground-child
lib/node_modules/npm/node_modules/fs-minipass
@@ -2356,7 +2258,6 @@ lib/node_modules/npm/node_modules/gauge
lib/node_modules/npm/node_modules/glob
lib/node_modules/npm/node_modules/graceful-fs
lib/node_modules/npm/node_modules/has
-lib/node_modules/npm/node_modules/has-flag
lib/node_modules/npm/node_modules/has-unicode
lib/node_modules/npm/node_modules/hosted-git-info
lib/node_modules/npm/node_modules/http-cache-semantics
@@ -2368,7 +2269,6 @@ lib/node_modules/npm/node_modules/ieee75
lib/node_modules/npm/node_modules/ignore-walk
lib/node_modules/npm/node_modules/imurmurhash
lib/node_modules/npm/node_modules/indent-string
-lib/node_modules/npm/node_modules/infer-owner
lib/node_modules/npm/node_modules/inflight
lib/node_modules/npm/node_modules/inherits
lib/node_modules/npm/node_modules/ini
@@ -2898,13 +2798,6 @@ lib/node_modules/sigstore/dist/identity/
lib/node_modules/sigstore/dist/identity/provider.js
lib/node_modules/sigstore/dist/index.d.ts
lib/node_modules/sigstore/dist/index.js
-lib/node_modules/sigstore/dist/merkle/
-lib/node_modules/sigstore/dist/merkle/digest.d.ts
-lib/node_modules/sigstore/dist/merkle/digest.js
-lib/node_modules/sigstore/dist/merkle/index.d.ts
-lib/node_modules/sigstore/dist/merkle/index.js
-lib/node_modules/sigstore/dist/merkle/verify.d.ts
-lib/node_modules/sigstore/dist/merkle/verify.js
lib/node_modules/sigstore/dist/sign.d.ts
lib/node_modules/sigstore/dist/sign.js
lib/node_modules/sigstore/dist/sigstore-utils.d.ts
@@ -2916,29 +2809,18 @@ lib/node_modules/sigstore/dist/tlog/form
lib/node_modules/sigstore/dist/tlog/format.js
lib/node_modules/sigstore/dist/tlog/index.d.ts
lib/node_modules/sigstore/dist/tlog/index.js
-lib/node_modules/sigstore/dist/tlog/types/
-lib/node_modules/sigstore/dist/tlog/types/__generated__/
-lib/node_modules/sigstore/dist/tlog/types/__generated__/hashedrekord.d.ts
-lib/node_modules/sigstore/dist/tlog/types/__generated__/hashedrekord.js
-lib/node_modules/sigstore/dist/tlog/types/__generated__/intoto.d.ts
-lib/node_modules/sigstore/dist/tlog/types/__generated__/intoto.js
-lib/node_modules/sigstore/dist/tlog/types/index.d.ts
-lib/node_modules/sigstore/dist/tlog/types/index.js
lib/node_modules/sigstore/dist/tlog/verify/
lib/node_modules/sigstore/dist/tlog/verify/body.d.ts
lib/node_modules/sigstore/dist/tlog/verify/body.js
lib/node_modules/sigstore/dist/tlog/verify/index.d.ts
lib/node_modules/sigstore/dist/tlog/verify/index.js
+lib/node_modules/sigstore/dist/tlog/verify/merkle.d.ts
+lib/node_modules/sigstore/dist/tlog/verify/merkle.js
lib/node_modules/sigstore/dist/tlog/verify/set.d.ts
lib/node_modules/sigstore/dist/tlog/verify/set.js
lib/node_modules/sigstore/dist/tsa/
lib/node_modules/sigstore/dist/tsa/index.d.ts
lib/node_modules/sigstore/dist/tsa/index.js
-lib/node_modules/sigstore/dist/tuf/
-lib/node_modules/sigstore/dist/tuf/index.d.ts
-lib/node_modules/sigstore/dist/tuf/index.js
-lib/node_modules/sigstore/dist/tuf/target.d.ts
-lib/node_modules/sigstore/dist/tuf/target.js
lib/node_modules/sigstore/dist/types/
lib/node_modules/sigstore/dist/types/fetch.d.ts
lib/node_modules/sigstore/dist/types/fetch.js
@@ -2954,8 +2836,21 @@ lib/node_modules/sigstore/dist/types/sig
lib/node_modules/sigstore/dist/types/utility.d.ts
lib/node_modules/sigstore/dist/types/utility.js
lib/node_modules/sigstore/dist/util/
-lib/node_modules/sigstore/dist/util/appdata.d.ts
-lib/node_modules/sigstore/dist/util/appdata.js
+lib/node_modules/sigstore/dist/util/asn1/
+lib/node_modules/sigstore/dist/util/asn1/dump.d.ts
+lib/node_modules/sigstore/dist/util/asn1/dump.js
+lib/node_modules/sigstore/dist/util/asn1/error.d.ts
+lib/node_modules/sigstore/dist/util/asn1/error.js
+lib/node_modules/sigstore/dist/util/asn1/index.d.ts
+lib/node_modules/sigstore/dist/util/asn1/index.js
+lib/node_modules/sigstore/dist/util/asn1/length.d.ts
+lib/node_modules/sigstore/dist/util/asn1/length.js
+lib/node_modules/sigstore/dist/util/asn1/obj.d.ts
+lib/node_modules/sigstore/dist/util/asn1/obj.js
+lib/node_modules/sigstore/dist/util/asn1/parse.d.ts
+lib/node_modules/sigstore/dist/util/asn1/parse.js
+lib/node_modules/sigstore/dist/util/asn1/tag.d.ts
+lib/node_modules/sigstore/dist/util/asn1/tag.js
lib/node_modules/sigstore/dist/util/crypto.d.ts
lib/node_modules/sigstore/dist/util/crypto.js
lib/node_modules/sigstore/dist/util/dsse.d.ts
@@ -2979,19 +2874,6 @@ lib/node_modules/sigstore/dist/util/ua.j
lib/node_modules/sigstore/dist/verify.d.ts
lib/node_modules/sigstore/dist/verify.js
lib/node_modules/sigstore/dist/x509/
-lib/node_modules/sigstore/dist/x509/asn1/
-lib/node_modules/sigstore/dist/x509/asn1/dump.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/dump.js
-lib/node_modules/sigstore/dist/x509/asn1/error.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/error.js
-lib/node_modules/sigstore/dist/x509/asn1/length.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/length.js
-lib/node_modules/sigstore/dist/x509/asn1/obj.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/obj.js
-lib/node_modules/sigstore/dist/x509/asn1/parse.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/parse.js
-lib/node_modules/sigstore/dist/x509/asn1/tag.d.ts
-lib/node_modules/sigstore/dist/x509/asn1/tag.js
lib/node_modules/sigstore/dist/x509/cert.d.ts
lib/node_modules/sigstore/dist/x509/cert.js
lib/node_modules/sigstore/dist/x509/ext.d.ts
@@ -3001,8 +2883,6 @@ lib/node_modules/sigstore/dist/x509/sct.
lib/node_modules/sigstore/dist/x509/verify.d.ts
lib/node_modules/sigstore/dist/x509/verify.js
lib/node_modules/sigstore/package.json
-lib/node_modules/sigstore/store/
-lib/node_modules/sigstore/store/public-good-instance-root.json
lib/node_modules/smart-buffer/
lib/node_modules/smart-buffer/LICENSE
lib/node_modules/smart-buffer/build/
