Download raw body.
[Maintener Update] lang/node 20.16.0 + OpenSSL 3.2
Updates lang/node to the latest release and switches build to OpenSSL 3.2
Tested on arm64 and amd64, so far I noticed no fallout of the change in OpenSSL.
Upstream still bundles OpenSSL 3.0, so we're already deviating from upstream
here anyway.
Opinions? OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
diff -u -p -r1.137 Makefile
--- Makefile 15 Jul 2024 20:23:53 -0000 1.137
+++ Makefile 24 Jul 2024 21:47:16 -0000
@@ -5,7 +5,7 @@ USE_WXNEEDED = Yes
COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine
-NODE_VERSION = v20.15.1
+NODE_VERSION = v20.16.0
PLEDGE_VER = 1.1.3
DISTFILES = ${DISTNAME}-headers.tar.gz \
${DISTNAME}.tar.xz
@@ -32,7 +32,7 @@ MODULES = lang/python
WANTLIB += c execinfo m pthread ${COMPILER_LIBCXX}
WANTLIB += z brotlienc brotlidec
WANTLIB += icudata icui18n icuuc cares nghttp2 uv
-WANTLIB += lib/eopenssl31/ssl lib/eopenssl31/crypto
+WANTLIB += lib/eopenssl32/ssl lib/eopenssl32/crypto
COMPILER = base-clang ports-gcc
@@ -75,10 +75,10 @@ LIB_DEPENDS += archivers/brotli \
devel/libuv \
textproc/icu4c \
www/nghttp2 \
- security/openssl/3.1
+ security/openssl/3.2
-EOPENSSL_LIB = ${LOCALBASE}/lib/eopenssl31
-EOPENSSL_INC = ${LOCALBASE}/include/eopenssl31
+EOPENSSL_LIB = ${LOCALBASE}/lib/eopenssl32
+EOPENSSL_INC = ${LOCALBASE}/include/eopenssl32
post-extract:
mv ${WRKDIR}/node-pledge-${PLEDGE_VER} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
diff -u -p -r1.78 distinfo
--- distinfo 15 Jul 2024 20:23:53 -0000 1.78
+++ distinfo 24 Jul 2024 21:47:16 -0000
@@ -1,6 +1,6 @@
SHA256 (node-pledge-1.1.3.tar.gz) = fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU=
-SHA256 (node-v20.15.1-headers.tar.gz) = jCMFxt9dFFJeBxHw2jgpVgCYffTCcQxzjAFACGKhdrQ=
-SHA256 (node-v20.15.1.tar.xz) = /dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=
+SHA256 (node-v20.16.0-headers.tar.gz) = bMVpCme5seH6jO2uykHxvbXhrx95SHYceY0z2Z94mlw=
+SHA256 (node-v20.16.0.tar.xz) = zWyPw/8mBqrbxxVdtvfnckfS0AZawY4vfwSQlVhLi0Y=
SIZE (node-pledge-1.1.3.tar.gz) = 3167
-SIZE (node-v20.15.1-headers.tar.gz) = 8773669
-SIZE (node-v20.15.1.tar.xz) = 41880412
+SIZE (node-v20.16.0-headers.tar.gz) = 8750056
+SIZE (node-v20.16.0.tar.xz) = 41822608
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v
diff -u -p -r1.21 patch-Makefile
--- patches/patch-Makefile 22 Jun 2024 07:01:13 -0000 1.21
+++ patches/patch-Makefile 24 Jul 2024 21:47:16 -0000
@@ -1,7 +1,7 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -189,7 +189,7 @@ config.gypi: configure configure.py src/node_version.h
+@@ -190,7 +190,7 @@ config.gypi: configure configure.py src/node_version.h
fi
.PHONY: install
@@ -10,7 +10,7 @@ Index: Makefile
$(PYTHON) tools/install.py $@ --dest-dir '$(DESTDIR)' --prefix '$(PREFIX)'
.PHONY: uninstall
-@@ -436,6 +436,12 @@ test/addons/.buildstamp: $(ADDONS_PREREQS) \
+@@ -437,6 +437,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-configure
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-configure,v
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 18 May 2024 12:10:22 -0000 1.3
+++ patches/patch-configure 24 Jul 2024 21:47:16 -0000
@@ -1,10 +1,11 @@
Index: configure
--- configure.orig
+++ configure
-@@ -4,13 +4,6 @@
+@@ -4,14 +4,6 @@
# Note that the mix of single and double quotes is intentional,
# as is the fact that the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
+-command -v python3.13 >/dev/null && exec python3.13 "$0" "$@"
-command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
-command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
-command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
Index: patches/patch-deps_ada_ada_cpp
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-deps_ada_ada_cpp,v
diff -u -p -r1.2 patch-deps_ada_ada_cpp
--- patches/patch-deps_ada_ada_cpp 18 May 2024 12:10:22 -0000 1.2
+++ patches/patch-deps_ada_ada_cpp 24 Jul 2024 21:47:16 -0000
@@ -1,7 +1,7 @@
Index: deps/ada/ada.cpp
--- deps/ada/ada.cpp.orig
+++ deps/ada/ada.cpp
-@@ -10485,7 +10485,7 @@ ada_unused std::string get_state(ada::state s) {
+@@ -10488,7 +10488,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";
Index: patches/patch-deps_ada_ada_h
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-deps_ada_ada_h,v
diff -u -p -r1.2 patch-deps_ada_ada_h
--- patches/patch-deps_ada_ada_h 18 May 2024 12:10:22 -0000 1.2
+++ patches/patch-deps_ada_ada_h 24 Jul 2024 21:47:16 -0000
@@ -1,12 +1,12 @@
Index: deps/ada/ada.h
--- deps/ada/ada.h.orig
+++ deps/ada/ada.h
-@@ -1229,7 +1229,7 @@ enum class state {
- SPECIAL_AUTHORITY_IGNORE_SLASHES,
- SPECIAL_AUTHORITY_SLASHES,
- SPECIAL_RELATIVE_OR_AUTHORITY,
+@@ -1292,7 +1292,7 @@ enum class state {
+ /**
+ * @see https://url.spec.whatwg.org/#query-state
+ */
- QUERY,
+ ADAQUERY,
- PATH,
- PATH_START,
- OPAQUE_PATH,
+
+ /**
+ * @see https://url.spec.whatwg.org/#path-state
Index: patches/patch-lib_net_js
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-lib_net_js,v
diff -u -p -r1.10 patch-lib_net_js
--- patches/patch-lib_net_js 18 May 2024 12:10:22 -0000 1.10
+++ patches/patch-lib_net_js 24 Jul 2024 21:47:16 -0000
@@ -13,7 +13,7 @@ for "any address" but that's not really
Index: lib/net.js
--- lib/net.js.orig
+++ lib/net.js
-@@ -1860,22 +1860,12 @@ function setupListenHandle(address, port, addressType,
+@@ -1861,22 +1861,12 @@ function setupListenHandle(address, port, addressType,
let rval = null;
Index: patches/patch-node_gyp
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-node_gyp,v
diff -u -p -r1.23 patch-node_gyp
--- patches/patch-node_gyp 22 Jun 2024 07:01:13 -0000 1.23
+++ patches/patch-node_gyp 24 Jul 2024 21:47:16 -0000
@@ -4,7 +4,7 @@ devel/gtest if installed.
Index: node.gyp
--- node.gyp.orig
+++ node.gyp
-@@ -826,7 +826,7 @@
+@@ -828,7 +828,7 @@
],
'dependencies': [
'deps/base64/base64.gyp:base64',
@@ -13,7 +13,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'deps/simdutf/simdutf.gyp:simdutf',
-@@ -1144,8 +1144,8 @@
+@@ -1146,8 +1146,8 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/base64/base64.gyp:base64',
@@ -24,7 +24,7 @@ Index: node.gyp
'deps/histogram/histogram.gyp:histogram',
'deps/uvwasi/uvwasi.gyp:uvwasi',
'deps/simdutf/simdutf.gyp:simdutf',
-@@ -1193,6 +1193,10 @@
+@@ -1195,6 +1195,10 @@
}],
['OS=="solaris"', {
'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
Index: patches/patch-src_env_cc
===================================================================
RCS file: /cvs/ports/lang/node/patches/patch-src_env_cc,v
diff -u -p -r1.9 patch-src_env_cc
--- patches/patch-src_env_cc 18 May 2024 12:10:22 -0000 1.9
+++ patches/patch-src_env_cc 24 Jul 2024 21:47:16 -0000
@@ -1,7 +1,7 @@
Index: src/env.cc
--- src/env.cc.orig
+++ src/env.cc
-@@ -745,29 +745,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
+@@ -757,29 +757,7 @@ std::unique_ptr<v8::BackingStore> Environment::release
}
std::string Environment::GetExecPath(const std::vector<std::string>& argv) {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/node/pkg/PLIST,v
diff -u -p -r1.63 PLIST
--- pkg/PLIST 22 Jun 2024 07:01:15 -0000 1.63
+++ pkg/PLIST 24 Jul 2024 21:47:16 -0000
@@ -207,6 +207,7 @@ lib/node_modules/@npmcli/arborist/lib/no
lib/node_modules/@npmcli/arborist/lib/optional-set.js
lib/node_modules/@npmcli/arborist/lib/override-resolves.js
lib/node_modules/@npmcli/arborist/lib/override-set.js
+lib/node_modules/@npmcli/arborist/lib/packument-cache.js
lib/node_modules/@npmcli/arborist/lib/peer-entry-sets.js
lib/node_modules/@npmcli/arborist/lib/place-dep.js
lib/node_modules/@npmcli/arborist/lib/printable.js
@@ -441,6 +442,7 @@ lib/node_modules/@sigstore/sign/dist/bun
lib/node_modules/@sigstore/sign/dist/error.js
lib/node_modules/@sigstore/sign/dist/external/
lib/node_modules/@sigstore/sign/dist/external/error.js
+lib/node_modules/@sigstore/sign/dist/external/fetch.js
lib/node_modules/@sigstore/sign/dist/external/fulcio.js
lib/node_modules/@sigstore/sign/dist/external/rekor.js
lib/node_modules/@sigstore/sign/dist/external/tsa.js
@@ -610,10 +612,6 @@ lib/node_modules/brace-expansion/
lib/node_modules/brace-expansion/LICENSE
lib/node_modules/brace-expansion/index.js
lib/node_modules/brace-expansion/package.json
-lib/node_modules/builtins/
-lib/node_modules/builtins/License
-lib/node_modules/builtins/index.js
-lib/node_modules/builtins/package.json
lib/node_modules/cacache/
lib/node_modules/cacache/LICENSE.md
lib/node_modules/cacache/lib/
@@ -657,7 +655,8 @@ lib/node_modules/ci-info/package.json
lib/node_modules/ci-info/vendors.json
lib/node_modules/cidr-regex/
lib/node_modules/cidr-regex/LICENSE
-lib/node_modules/cidr-regex/index.js
+lib/node_modules/cidr-regex/dist/
+lib/node_modules/cidr-regex/dist/index.js
lib/node_modules/cidr-regex/package.json
lib/node_modules/clean-stack/
lib/node_modules/clean-stack/index.js
@@ -1076,7 +1075,8 @@ lib/node_modules/ip-regex/index.js
lib/node_modules/ip-regex/license
lib/node_modules/ip-regex/package.json
lib/node_modules/is-cidr/
-lib/node_modules/is-cidr/index.js
+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
@@ -1895,6 +1895,8 @@ lib/node_modules/npm/docs/output/command
lib/node_modules/npm/docs/output/configuring-npm/
lib/node_modules/npm/docs/output/configuring-npm/folders.html
lib/node_modules/npm/docs/output/configuring-npm/install.html
+lib/node_modules/npm/docs/output/configuring-npm/npm-global.html
+lib/node_modules/npm/docs/output/configuring-npm/npm-json.html
lib/node_modules/npm/docs/output/configuring-npm/npm-shrinkwrap-json.html
lib/node_modules/npm/docs/output/configuring-npm/npmrc.html
lib/node_modules/npm/docs/output/configuring-npm/package-json.html
@@ -2013,9 +2015,8 @@ lib/node_modules/npm/lib/utils/installed
lib/node_modules/npm/lib/utils/is-windows.js
lib/node_modules/npm/lib/utils/log-file.js
lib/node_modules/npm/lib/utils/npm-usage.js
-lib/node_modules/npm/lib/utils/open-url-prompt.js
lib/node_modules/npm/lib/utils/open-url.js
-lib/node_modules/npm/lib/utils/otplease.js
+lib/node_modules/npm/lib/utils/output-error.js
lib/node_modules/npm/lib/utils/ping.js
lib/node_modules/npm/lib/utils/queryable.js
lib/node_modules/npm/lib/utils/read-user-info.js
@@ -2028,7 +2029,6 @@ lib/node_modules/npm/lib/utils/timers.js
lib/node_modules/npm/lib/utils/update-workspaces.js
lib/node_modules/npm/lib/utils/validate-lockfile.js
lib/node_modules/npm/lib/utils/verify-signatures.js
-lib/node_modules/npm/lib/utils/web-auth.js
@mandir lib/node_modules/npm/man/
lib/node_modules/npm/man/man1/
@man lib/node_modules/npm/man/man1/npm-access.1
@@ -2135,7 +2135,6 @@ lib/node_modules/npm/node_modules/balanc
lib/node_modules/npm/node_modules/bin-links
lib/node_modules/npm/node_modules/binary-extensions
lib/node_modules/npm/node_modules/brace-expansion
-lib/node_modules/npm/node_modules/builtins
lib/node_modules/npm/node_modules/cacache
lib/node_modules/npm/node_modules/chalk
lib/node_modules/npm/node_modules/chownr
@@ -2290,8 +2289,9 @@ lib/node_modules/p-map/package.json
lib/node_modules/pacote/
lib/node_modules/pacote/LICENSE
lib/node_modules/pacote/README.md
+lib/node_modules/pacote/bin/
+lib/node_modules/pacote/bin/index.js
lib/node_modules/pacote/lib/
-lib/node_modules/pacote/lib/bin.js
lib/node_modules/pacote/lib/dir.js
lib/node_modules/pacote/lib/fetcher.js
lib/node_modules/pacote/lib/file.js
@@ -2304,6 +2304,7 @@ lib/node_modules/pacote/lib/util/add-git
lib/node_modules/pacote/lib/util/cache-dir.js
lib/node_modules/pacote/lib/util/is-package-bin.js
lib/node_modules/pacote/lib/util/npm.js
+lib/node_modules/pacote/lib/util/protected.js
lib/node_modules/pacote/lib/util/tar-create-options.js
lib/node_modules/pacote/lib/util/trailing-slashes.js
lib/node_modules/pacote/package.json
@@ -2507,13 +2508,9 @@ lib/node_modules/semver/internal/
lib/node_modules/semver/internal/constants.js
lib/node_modules/semver/internal/debug.js
lib/node_modules/semver/internal/identifiers.js
+lib/node_modules/semver/internal/lrucache.js
lib/node_modules/semver/internal/parse-options.js
lib/node_modules/semver/internal/re.js
-lib/node_modules/semver/node_modules/
-lib/node_modules/semver/node_modules/lru-cache/
-lib/node_modules/semver/node_modules/lru-cache/LICENSE
-lib/node_modules/semver/node_modules/lru-cache/index.js
-lib/node_modules/semver/node_modules/lru-cache/package.json
lib/node_modules/semver/package.json
lib/node_modules/semver/preload.js
lib/node_modules/semver/range.bnf
[Maintener Update] lang/node 20.16.0 + OpenSSL 3.2