From: Volker Schlecht Subject: [Maintainer Update] lang/node 20.17.0 To: ports@openbsd.org Date: Tue, 27 Aug 2024 20:12:33 +0200 Simple update to the latest release plus a bit of npm-based PLIST churn. Builds and works fine on arm64 and amd64, v8 barely changed so unlikely to cause issues with other archs. ok? Index: Makefile =================================================================== RCS file: /cvs/ports/lang/node/Makefile,v diff -u -p -r1.138 Makefile --- Makefile 27 Jul 2024 15:17:54 -0000 1.138 +++ Makefile 27 Aug 2024 11:55:32 -0000 @@ -5,7 +5,7 @@ USE_WXNEEDED = Yes COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine -NODE_VERSION = v20.16.0 +NODE_VERSION = v20.17.0 PLEDGE_VER = 1.1.3 DISTFILES = ${DISTNAME}-headers.tar.gz \ ${DISTNAME}.tar.xz Index: distinfo =================================================================== RCS file: /cvs/ports/lang/node/distinfo,v diff -u -p -r1.79 distinfo --- distinfo 27 Jul 2024 15:17:54 -0000 1.79 +++ distinfo 27 Aug 2024 11:55:32 -0000 @@ -1,6 +1,6 @@ SHA256 (node-pledge-1.1.3.tar.gz) = fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU= -SHA256 (node-v20.16.0-headers.tar.gz) = bMVpCme5seH6jO2uykHxvbXhrx95SHYceY0z2Z94mlw= -SHA256 (node-v20.16.0.tar.xz) = zWyPw/8mBqrbxxVdtvfnckfS0AZawY4vfwSQlVhLi0Y= +SHA256 (node-v20.17.0-headers.tar.gz) = zNgJhC5QysYMM8Qpbwq4M1GQ4mVkSWEiipgsk5Qgve0= +SHA256 (node-v20.17.0.tar.xz) = mr8DrCM2LGA4frtjOlFjA2NxRcs8F3vjNIsWiA/Ysow= SIZE (node-pledge-1.1.3.tar.gz) = 3167 -SIZE (node-v20.16.0-headers.tar.gz) = 8750056 -SIZE (node-v20.16.0.tar.xz) = 41822608 +SIZE (node-v20.17.0-headers.tar.gz) = 8761389 +SIZE (node-v20.17.0.tar.xz) = 41751520 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v diff -u -p -r1.22 patch-Makefile --- patches/patch-Makefile 27 Jul 2024 15:17:56 -0000 1.22 +++ patches/patch-Makefile 27 Aug 2024 11:55:32 -0000 @@ -10,7 +10,7 @@ Index: Makefile $(PYTHON) tools/install.py $@ --dest-dir '$(DESTDIR)' --prefix '$(PREFIX)' .PHONY: uninstall -@@ -437,6 +437,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \ +@@ -438,6 +438,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \ # Just goes to show that recursive make really is harmful... # TODO(bnoordhuis) Force rebuild after gyp update. build-addons: | $(NODE_EXE) test/addons/.buildstamp Index: patches/patch-common_gypi =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-common_gypi,v diff -u -p -r1.31 patch-common_gypi --- patches/patch-common_gypi 18 May 2024 12:10:22 -0000 1.31 +++ patches/patch-common_gypi 27 Aug 2024 11:55:32 -0000 @@ -1,7 +1,7 @@ Index: common.gypi --- common.gypi.orig +++ common.gypi -@@ -189,7 +189,6 @@ +@@ -190,7 +190,6 @@ }], ], }, @@ -9,7 +9,7 @@ Index: common.gypi 'conditions': [ ['enable_lto=="true"', { 'cflags': ['<(lto)'], -@@ -473,7 +472,9 @@ +@@ -474,7 +473,9 @@ }], ['OS=="openbsd"', { 'cflags': [ '-I/usr/local/include' ], @@ -20,7 +20,7 @@ Index: common.gypi }], ['_toolset=="host"', { 'conditions': [ -@@ -490,7 +491,7 @@ +@@ -491,7 +492,7 @@ 'ldflags': [ '-m32' ], }], [ 'host_arch=="ppc64" and OS not in "aix os400"', { @@ -29,7 +29,7 @@ Index: common.gypi 'ldflags': [ '-m64' ], }], [ 'host_arch=="s390x" and OS=="linux"', { -@@ -514,7 +515,7 @@ +@@ -515,7 +516,7 @@ 'ldflags': [ '-m32' ], }], [ 'target_arch=="ppc64" and OS not in "aix os400"', { Index: patches/patch-configure_py =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-configure_py,v diff -u -p -r1.6 patch-configure_py --- patches/patch-configure_py 22 Jun 2024 07:01:13 -0000 1.6 +++ patches/patch-configure_py 27 Aug 2024 11:55:32 -0000 @@ -1,7 +1,7 @@ Index: configure.py --- configure.py.orig +++ configure.py -@@ -1598,6 +1598,10 @@ def configure_v8(o): +@@ -1599,6 +1599,10 @@ def configure_v8(o): raise Exception( 'Only one of the --v8-enable-object-print or --v8-disable-object-print options ' 'can be specified at a time.') Index: patches/patch-deps_ada_ada_cpp =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-deps_ada_ada_cpp,v diff -u -p -r1.3 patch-deps_ada_ada_cpp --- patches/patch-deps_ada_ada_cpp 27 Jul 2024 15:17:56 -0000 1.3 +++ patches/patch-deps_ada_ada_cpp 27 Aug 2024 11:55:32 -0000 @@ -1,7 +1,7 @@ Index: deps/ada/ada.cpp --- deps/ada/ada.cpp.orig +++ deps/ada/ada.cpp -@@ -10488,7 +10488,7 @@ ada_unused std::string get_state(ada::state s) { +@@ -10486,7 +10486,7 @@ ada_unused std::string get_state(ada::state s) { return "Special Authority Slashes"; case ada::state::SPECIAL_RELATIVE_OR_AUTHORITY: return "Special Relative or Authority"; @@ -10,7 +10,7 @@ Index: deps/ada/ada.cpp return "Query"; case ada::state::PATH: return "Path"; -@@ -12573,7 +12573,7 @@ result_type parse_url(std::string_view user_input, +@@ -12575,7 +12575,7 @@ result_type parse_url_impl(std::string_view user_input // state to query state. if ((input_position != input_size) && (url_data[input_position] == '?')) { @@ -19,16 +19,16 @@ Index: deps/ada/ada.cpp } // Otherwise, if c is not the EOF code point: else if (input_position != input_size) { -@@ -12668,7 +12668,7 @@ result_type parse_url(std::string_view user_input, +@@ -12670,7 +12670,7 @@ result_type parse_url_impl(std::string_view user_input break; } - case ada::state::QUERY: { + case ada::state::ADAQUERY: { ada_log("QUERY ", helpers::substring(url_data, input_position)); - // Let queryPercentEncodeSet be the special-query percent-encode set if - // url is special; otherwise the query percent-encode set. -@@ -12750,7 +12750,7 @@ result_type parse_url(std::string_view user_input, + if constexpr (store_values) { + // Let queryPercentEncodeSet be the special-query percent-encode set +@@ -12755,7 +12755,7 @@ result_type parse_url_impl(std::string_view user_input size_t location = view.find('?'); if (location != std::string_view::npos) { view.remove_suffix(view.size() - location); @@ -37,7 +37,7 @@ Index: deps/ada/ada.cpp input_position += location + 1; } else { input_position = input_size + 1; -@@ -12803,7 +12803,7 @@ result_type parse_url(std::string_view user_input, +@@ -12810,7 +12810,7 @@ result_type parse_url_impl(std::string_view user_input // set url's query to the empty string and state to query state. else if ((input_position != input_size) && (url_data[input_position] == '?')) { @@ -46,7 +46,7 @@ Index: deps/ada/ada.cpp } // Otherwise, if c is not the EOF code point: else if (input_position != input_size) { -@@ -12827,7 +12827,7 @@ result_type parse_url(std::string_view user_input, +@@ -12834,7 +12834,7 @@ result_type parse_url_impl(std::string_view user_input // Furthermore, we can immediately locate the '?'. size_t locofquestionmark = view.find('?'); if (locofquestionmark != std::string_view::npos) { @@ -55,7 +55,7 @@ Index: deps/ada/ada.cpp view.remove_suffix(view.size() - locofquestionmark); input_position += locofquestionmark + 1; } else { -@@ -12987,7 +12987,7 @@ result_type parse_url(std::string_view user_input, +@@ -12996,7 +12996,7 @@ result_type parse_url_impl(std::string_view user_input // If c is U+003F (?), then set url's query to the empty string and // state to query state. if (input_position != input_size && url_data[input_position] == '?') { Index: patches/patch-include_node_common_gypi =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-include_node_common_gypi,v diff -u -p -r1.5 patch-include_node_common_gypi --- patches/patch-include_node_common_gypi 18 May 2024 12:10:22 -0000 1.5 +++ patches/patch-include_node_common_gypi 27 Aug 2024 11:55:32 -0000 @@ -1,7 +1,7 @@ Index: include/node/common.gypi --- include/node/common.gypi.orig +++ include/node/common.gypi -@@ -189,7 +189,6 @@ +@@ -190,7 +190,6 @@ }], ], }, @@ -9,7 +9,7 @@ Index: include/node/common.gypi 'conditions': [ ['enable_lto=="true"', { 'cflags': ['<(lto)'], -@@ -490,7 +489,7 @@ +@@ -491,7 +490,7 @@ 'ldflags': [ '-m32' ], }], [ 'host_arch=="ppc64" and OS not in "aix os400"', { @@ -18,7 +18,7 @@ Index: include/node/common.gypi 'ldflags': [ '-m64' ], }], [ 'host_arch=="s390x" and OS=="linux"', { -@@ -514,7 +513,7 @@ +@@ -515,7 +514,7 @@ 'ldflags': [ '-m32' ], }], [ 'target_arch=="ppc64" and OS not in "aix os400"', { Index: patches/patch-lib_internal_modules_cjs_loader_js =================================================================== RCS file: /cvs/ports/lang/node/patches/patch-lib_internal_modules_cjs_loader_js,v diff -u -p -r1.13 patch-lib_internal_modules_cjs_loader_js --- patches/patch-lib_internal_modules_cjs_loader_js 18 May 2024 12:10:22 -0000 1.13 +++ patches/patch-lib_internal_modules_cjs_loader_js 27 Aug 2024 11:55:32 -0000 @@ -1,7 +1,7 @@ Index: lib/internal/modules/cjs/loader.js --- lib/internal/modules/cjs/loader.js.orig +++ lib/internal/modules/cjs/loader.js -@@ -1518,7 +1518,10 @@ Module._initPaths = function() { +@@ -1650,7 +1650,10 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/node/pkg/PLIST,v diff -u -p -r1.64 PLIST --- pkg/PLIST 27 Jul 2024 15:17:59 -0000 1.64 +++ pkg/PLIST 27 Aug 2024 11:55:32 -0000 @@ -312,6 +312,7 @@ lib/node_modules/@npmcli/package-json/LI lib/node_modules/@npmcli/package-json/lib/ lib/node_modules/@npmcli/package-json/lib/index.js lib/node_modules/@npmcli/package-json/lib/normalize.js +lib/node_modules/@npmcli/package-json/lib/read-package.js lib/node_modules/@npmcli/package-json/lib/update-dependencies.js lib/node_modules/@npmcli/package-json/lib/update-scripts.js lib/node_modules/@npmcli/package-json/lib/update-workspaces.js @@ -879,27 +880,24 @@ lib/node_modules/fastest-levenshtein/tes lib/node_modules/foreground-child/ lib/node_modules/foreground-child/LICENSE lib/node_modules/foreground-child/dist/ -lib/node_modules/foreground-child/dist/cjs/ -lib/node_modules/foreground-child/dist/cjs/all-signals.js -lib/node_modules/foreground-child/dist/cjs/index.js -lib/node_modules/foreground-child/dist/cjs/package.json -lib/node_modules/foreground-child/dist/cjs/watchdog.js -lib/node_modules/foreground-child/dist/mjs/ -lib/node_modules/foreground-child/dist/mjs/all-signals.js -lib/node_modules/foreground-child/dist/mjs/index.js -lib/node_modules/foreground-child/dist/mjs/package.json -lib/node_modules/foreground-child/dist/mjs/watchdog.js +lib/node_modules/foreground-child/dist/commonjs/ +lib/node_modules/foreground-child/dist/commonjs/all-signals.js +lib/node_modules/foreground-child/dist/commonjs/index.js +lib/node_modules/foreground-child/dist/commonjs/package.json +lib/node_modules/foreground-child/dist/commonjs/proxy-signals.js +lib/node_modules/foreground-child/dist/commonjs/watchdog.js +lib/node_modules/foreground-child/dist/esm/ +lib/node_modules/foreground-child/dist/esm/all-signals.js +lib/node_modules/foreground-child/dist/esm/index.js +lib/node_modules/foreground-child/dist/esm/package.json +lib/node_modules/foreground-child/dist/esm/proxy-signals.js +lib/node_modules/foreground-child/dist/esm/watchdog.js lib/node_modules/foreground-child/package.json lib/node_modules/fs-minipass/ lib/node_modules/fs-minipass/LICENSE lib/node_modules/fs-minipass/lib/ lib/node_modules/fs-minipass/lib/index.js lib/node_modules/fs-minipass/package.json -lib/node_modules/function-bind/ -lib/node_modules/function-bind/LICENSE -lib/node_modules/function-bind/implementation.js -lib/node_modules/function-bind/index.js -lib/node_modules/function-bind/package.json lib/node_modules/glob/ lib/node_modules/glob/LICENSE lib/node_modules/glob/README.md @@ -976,11 +974,6 @@ lib/node_modules/graceful-fs/graceful-fs lib/node_modules/graceful-fs/legacy-streams.js lib/node_modules/graceful-fs/package.json lib/node_modules/graceful-fs/polyfills.js -lib/node_modules/hasown/ -lib/node_modules/hasown/LICENSE -lib/node_modules/hasown/index.js -lib/node_modules/hasown/package.json -lib/node_modules/hasown/tsconfig.json lib/node_modules/hosted-git-info/ lib/node_modules/hosted-git-info/LICENSE lib/node_modules/hosted-git-info/lib/ @@ -1078,11 +1071,6 @@ lib/node_modules/is-cidr/ lib/node_modules/is-cidr/dist/ lib/node_modules/is-cidr/dist/index.js lib/node_modules/is-cidr/package.json -lib/node_modules/is-core-module/ -lib/node_modules/is-core-module/LICENSE -lib/node_modules/is-core-module/core.json -lib/node_modules/is-core-module/index.js -lib/node_modules/is-core-module/package.json lib/node_modules/is-fullwidth-code-point/ lib/node_modules/is-fullwidth-code-point/index.js lib/node_modules/is-fullwidth-code-point/license @@ -1305,15 +1293,6 @@ lib/node_modules/minipass-flush/node_mod lib/node_modules/minipass-flush/node_modules/minipass/index.js lib/node_modules/minipass-flush/node_modules/minipass/package.json lib/node_modules/minipass-flush/package.json -lib/node_modules/minipass-json-stream/ -lib/node_modules/minipass-json-stream/LICENSE -lib/node_modules/minipass-json-stream/index.js -lib/node_modules/minipass-json-stream/node_modules/ -lib/node_modules/minipass-json-stream/node_modules/minipass/ -lib/node_modules/minipass-json-stream/node_modules/minipass/LICENSE -lib/node_modules/minipass-json-stream/node_modules/minipass/index.js -lib/node_modules/minipass-json-stream/node_modules/minipass/package.json -lib/node_modules/minipass-json-stream/package.json lib/node_modules/minipass-pipeline/ lib/node_modules/minipass-pipeline/LICENSE lib/node_modules/minipass-pipeline/index.js @@ -1712,6 +1691,7 @@ lib/node_modules/npm-registry-fetch/lib/ lib/node_modules/npm-registry-fetch/lib/default-opts.js lib/node_modules/npm-registry-fetch/lib/errors.js lib/node_modules/npm-registry-fetch/lib/index.js +lib/node_modules/npm-registry-fetch/lib/json-stream.js lib/node_modules/npm-registry-fetch/package.json lib/node_modules/npm-user-validate/ lib/node_modules/npm-user-validate/LICENSE @@ -2159,10 +2139,8 @@ lib/node_modules/npm/node_modules/expone lib/node_modules/npm/node_modules/fastest-levenshtein lib/node_modules/npm/node_modules/foreground-child lib/node_modules/npm/node_modules/fs-minipass -lib/node_modules/npm/node_modules/function-bind lib/node_modules/npm/node_modules/glob lib/node_modules/npm/node_modules/graceful-fs -lib/node_modules/npm/node_modules/hasown lib/node_modules/npm/node_modules/hosted-git-info lib/node_modules/npm/node_modules/http-cache-semantics lib/node_modules/npm/node_modules/http-proxy-agent @@ -2176,7 +2154,6 @@ lib/node_modules/npm/node_modules/init-p lib/node_modules/npm/node_modules/ip-address lib/node_modules/npm/node_modules/ip-regex lib/node_modules/npm/node_modules/is-cidr -lib/node_modules/npm/node_modules/is-core-module lib/node_modules/npm/node_modules/is-fullwidth-code-point lib/node_modules/npm/node_modules/is-lambda lib/node_modules/npm/node_modules/isexe @@ -2205,7 +2182,6 @@ lib/node_modules/npm/node_modules/minipa lib/node_modules/npm/node_modules/minipass-collect lib/node_modules/npm/node_modules/minipass-fetch lib/node_modules/npm/node_modules/minipass-flush -lib/node_modules/npm/node_modules/minipass-json-stream lib/node_modules/npm/node_modules/minipass-pipeline lib/node_modules/npm/node_modules/minipass-sized lib/node_modules/npm/node_modules/minizlib @@ -2228,6 +2204,7 @@ lib/node_modules/npm/node_modules/npm-pr lib/node_modules/npm/node_modules/npm-registry-fetch lib/node_modules/npm/node_modules/npm-user-validate lib/node_modules/npm/node_modules/p-map +lib/node_modules/npm/node_modules/package-json-from-dist lib/node_modules/npm/node_modules/pacote lib/node_modules/npm/node_modules/parse-conflict-json lib/node_modules/npm/node_modules/path-key @@ -2286,6 +2263,16 @@ lib/node_modules/p-map/ lib/node_modules/p-map/index.js lib/node_modules/p-map/license lib/node_modules/p-map/package.json +lib/node_modules/package-json-from-dist/ +lib/node_modules/package-json-from-dist/LICENSE.md +lib/node_modules/package-json-from-dist/dist/ +lib/node_modules/package-json-from-dist/dist/commonjs/ +lib/node_modules/package-json-from-dist/dist/commonjs/index.js +lib/node_modules/package-json-from-dist/dist/commonjs/package.json +lib/node_modules/package-json-from-dist/dist/esm/ +lib/node_modules/package-json-from-dist/dist/esm/index.js +lib/node_modules/package-json-from-dist/dist/esm/package.json +lib/node_modules/package-json-from-dist/package.json lib/node_modules/pacote/ lib/node_modules/pacote/LICENSE lib/node_modules/pacote/README.md