Merge branch '3.7' into 3.7

This commit is contained in:
Matt Housh 2024-02-28 23:09:02 +01:00
commit 616f2f1a33
6 changed files with 46 additions and 22 deletions

View File

@ -241,17 +241,13 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/bin/
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/ 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/add-rm-pkg-deps.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/add-rm-pkg-deps.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/audit.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/build-ideal-tree.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/deduper.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/index.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/isolated-reifier.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/isolated-reifier.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/load-actual.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/load-virtual.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/pruner.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/rebuild.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/rebuild.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/reify.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/arborist/set-workspaces.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/audit-report.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/audit-report.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/calc-dep-flags.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/can-place-dep.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/can-place-dep.js
@ -264,7 +260,6 @@ 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/edge.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/edge.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/from-path.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/from-path.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/gather-dep-set.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/gather-dep-set.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/get-workspace-nodes.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/index.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/inventory.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@npmcli/arborist/lib/inventory.js
-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/link.js
@ -431,7 +426,6 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/bundle/dist
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/dump.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/error.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/error.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/index.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/length.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/@sigstore/core/dist/asn1/length.js
@ -820,6 +814,7 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/create.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/create.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/merge.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/merge.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/parse.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/parse.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/patch/reverse.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/array.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/array.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/distance-iterator.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/diff/lib/util/distance-iterator.js
@ -1069,13 +1064,34 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/init-package-json/lib
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/lib/default-input.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/lib/default-input.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/lib/init-package-json.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/lib/init-package-json.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/init-package-json/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/address-error.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/common.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/ip-address.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/ipv4.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/ipv6.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v4/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v4/constants.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v6/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v6/constants.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v6/helpers.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/dist/v6/regular-expressions.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/CONTRIBUTORS.md
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/dist/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/dist/.gitattributes
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/dist/angular-sprintf.min.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/dist/sprintf.min.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/src/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/src/angular-sprintf.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/node_modules/sprintf-js/src/sprintf.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-address/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-regex/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/ip-regex/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-regex/index.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-regex/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-regex/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/ip-regex/package.json
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/is-cidr/ 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.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/is-cidr/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/is-cidr/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/is-cidr/package.json
@ -1111,6 +1127,13 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/jackspeak/dist/esm/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/dist/esm/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/dist/esm/package.json
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/dist/esm/parse-args.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/dist/esm/parse-args.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jackspeak/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/jsbn/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jsbn/example.html
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jsbn/example.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jsbn/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jsbn/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/jsbn/test/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/jsbn/test/es6-import.js
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/LICENSE.md -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/LICENSE.md
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/lib/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/json-parse-even-better-errors/lib/
@ -1821,6 +1844,7 @@ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/spdx-correct/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-correct/index.js -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-correct/index.js
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-correct/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-correct/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/deprecated.json
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/index.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/index.json
-rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/package.json -rw-r--r-- root/root usr/lib/node_modules/npm/node_modules/spdx-exceptions/package.json
drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/spdx-expression-parse/ drwxr-xr-x root/root usr/lib/node_modules/npm/node_modules/spdx-expression-parse/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF351CAv7iL64AxZUukdfkvBZw+DjibPJjnuoKdl0jmaE/6cWMCY8g4w4ltCUM8lZdj998PqcGBRBs+KlElKhMlAQ= RWSagIOpLGJF3zI+wQy2QtJb9SIMU/+80O2aAKG3djoxN/89uoZ+RAoyeq/VFO2v5MAD4bVSX6ztmiiNUwcGfIEkn7kTisfEXgI=
SHA256 (Pkgfile) = a3e80d82d45bfa3802ac5de6e5de73c57eae5db25335f320472c3d6056bf0ae3 SHA256 (Pkgfile) = 55468540d5349c9d0662e6f36958f095c5005abe6595ab1c89da4d581c0b59b8
SHA256 (.footprint) = 3988e82ab55241911c4629cb4c2c300feb6a9b72e1b927144850116c53eb8109 SHA256 (.footprint) = f4017b86002b5d36d56196b7853a488d8841c268ae3496cc8d18eaa565efda67
SHA256 (npm-10.4.0.tar.gz) = d8c7bf11ea8c0cf13b936e8ad936358745a682f3f64fc22e5c50d48f06966f66 SHA256 (npm-10.5.0.tar.gz) = 5eb30cbed05f6ddaa7c979f9d747b204cb95d74fefbd5ae3a05cfca2fc146f28

View File

@ -4,7 +4,7 @@
# Depends on: nodejs # Depends on: nodejs
name=npm name=npm
version=10.4.0 version=10.5.0
release=1 release=1
source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz) source=(https://github.com/npm/cli/archive/v$version/$name-$version.tar.gz)

View File

@ -16,7 +16,7 @@ drwxr-xr-x root/root usr/lib/cmake/openjpeg-2.5/
-rw-r--r-- root/root usr/lib/cmake/openjpeg-2.5/OpenJPEGTargets.cmake -rw-r--r-- root/root usr/lib/cmake/openjpeg-2.5/OpenJPEGTargets.cmake
-rw-r--r-- root/root usr/lib/libopenjp2.a -rw-r--r-- root/root usr/lib/libopenjp2.a
lrwxrwxrwx root/root usr/lib/libopenjp2.so -> libopenjp2.so.7 lrwxrwxrwx root/root usr/lib/libopenjp2.so -> libopenjp2.so.7
-rwxr-xr-x root/root usr/lib/libopenjp2.so.2.5.1 -rwxr-xr-x root/root usr/lib/libopenjp2.so.2.5.2
lrwxrwxrwx root/root usr/lib/libopenjp2.so.7 -> libopenjp2.so.2.5.1 lrwxrwxrwx root/root usr/lib/libopenjp2.so.7 -> libopenjp2.so.2.5.2
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libopenjp2.pc -rw-r--r-- root/root usr/lib/pkgconfig/libopenjp2.pc

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF38j/aUTLagWf8SHCThllxcq+8nY/LacMteiw43bXq7Ocd0liMhHELETVXK11++m7KZiPJcd9DFG2rGeWWVUd2gE= RWSagIOpLGJF30MjlU1bGsMwaDhElniPfo5RVStdt0qA3yd4czlu7EjHcYx4ff8TFtcvkat0uHBPkj3MFGYAs9BjANePc2+Awws=
SHA256 (Pkgfile) = dca704b2ca079002045eedeaee3a09f19fddb419c6117f88202b116d343ae71b SHA256 (Pkgfile) = a402b39f3b9d83c42e444c4065465541674b8ca3d362cbd7f4e234ab70b86e88
SHA256 (.footprint) = 0b9036f586ab1def8441583733c775dacc7a8288df89784f65fc0c00754fbe3d SHA256 (.footprint) = 082b78ea4c8f1b2bf06c28a80645121058b000a123f07f5c970cee044747eed2
SHA256 (openjpeg-2.5.1.tar.gz) = c0b92dadd65e33b1cf94f39dd9157d5469846744c2e0afb8ca10961f51f61da6 SHA256 (openjpeg-2.5.2.tar.gz) = 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a

View File

@ -4,7 +4,7 @@
# Depends on: lcms2 libpng # Depends on: lcms2 libpng
name=openjpeg2 name=openjpeg2
version=2.5.1 version=2.5.2
release=1 release=1
source=(https://github.com/uclouvain/openjpeg/archive/v$version/openjpeg-$version.tar.gz) source=(https://github.com/uclouvain/openjpeg/archive/v$version/openjpeg-$version.tar.gz)