From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:24:32 +0200 Subject: [PATCH 1/8] Rocket.Chat: rebuild for new nodejs version --- srcpkgs/Rocket.Chat-Desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template index d7ecb67b7473f3..96a03340478bb4 100644 --- a/srcpkgs/Rocket.Chat-Desktop/template +++ b/srcpkgs/Rocket.Chat-Desktop/template @@ -1,7 +1,7 @@ # Template file for 'Rocket.Chat-Desktop' pkgname=Rocket.Chat-Desktop version=3.8.7 -revision=2 +revision=3 _electron_ver=19 hostmakedepends="yarn nodejs python3 pkg-config app-builder" makedepends="electron${_electron_ver} libvips-devel" From b73703568b9507a1592566fd2ae38cee3c8b37d9 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:26:40 +0200 Subject: [PATCH 2/8] Signal-Desktop: rebuild for new nodejs version --- srcpkgs/Signal-Desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index cba44a86ff3d4c..d216e08c9004ad 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,7 +1,7 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop version=7.10.0 -revision=1 +revision=2 # Signal officially only supports x86_64 # x86_64-musl could potentially work based on the Alpine port: # https://git.alpinelinux.org/aports/tree/testing/signal-desktop From a9d6c750ec56750ada26c672eeb01229d7485222 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:27:18 +0200 Subject: [PATCH 3/8] ansible-language-server: rebuild for new nodejs version --- srcpkgs/ansible-language-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ansible-language-server/template b/srcpkgs/ansible-language-server/template index ef2bb4fef754a5..2a8a2cf610a9e7 100644 --- a/srcpkgs/ansible-language-server/template +++ b/srcpkgs/ansible-language-server/template @@ -1,7 +1,7 @@ # Template file for 'ansible-language-server' pkgname=ansible-language-server version=1.2.1 -revision=1 +revision=2 hostmakedepends="nodejs" depends="nodejs" short_desc="Ansible Language Server" From d37570666321e6add6f178f0ab9fb2ecaa7372e7 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 21:36:04 +0200 Subject: [PATCH 4/8] chronograf: rebuild for new nodejs version --- srcpkgs/chronograf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template index c25b767ab3b82a..561b7baa572fac 100644 --- a/srcpkgs/chronograf/template +++ b/srcpkgs/chronograf/template @@ -1,7 +1,7 @@ # Template file for 'chronograf' pkgname=chronograf version=1.10.2 -revision=1 +revision=2 build_style=go go_import_path="github.com/influxdata/${pkgname}" go_package="${go_import_path}/cmd/chronograf" From 6276b0051d8c19270fe3037f4e3c8c956480ce1a Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 21:36:25 +0200 Subject: [PATCH 5/8] keybase-desktop: rebuild for new nodejs version --- srcpkgs/keybase-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template index 21e711e5eddee7..91a799da7e49e8 100644 --- a/srcpkgs/keybase-desktop/template +++ b/srcpkgs/keybase-desktop/template @@ -1,7 +1,7 @@ # Template file for 'keybase-desktop' pkgname=keybase-desktop version=6.0.2 -revision=1 +revision=2 hostmakedepends="git nodejs yarn unzip" depends="keybase kbfs" short_desc="Keybase desktop client" From 5e2ac10b9e8b25d0f6741e4bb6191b9238b7996c Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 21:36:48 +0200 Subject: [PATCH 6/8] ntfy: rebuild for new nodejs version --- srcpkgs/ntfy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ntfy/template b/srcpkgs/ntfy/template index a1db042eaace41..5d12f42fd6828e 100644 --- a/srcpkgs/ntfy/template +++ b/srcpkgs/ntfy/template @@ -1,7 +1,7 @@ # Template file for 'ntfy' pkgname=ntfy version=2.11.0 -revision=1 +revision=2 build_style=go go_import_path="heckel.io/ntfy/v2" go_ldflags="-X main.version=${version} -X main.commit=v${version} From 0db288624aec41d72fd2e7b6276f16e017026f15 Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 21:37:14 +0200 Subject: [PATCH 7/8] imgbrd-grabber: rebuild for new nodejs version --- srcpkgs/imgbrd-grabber/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/imgbrd-grabber/template b/srcpkgs/imgbrd-grabber/template index d1e0ef6a517786..9b8ca0d452b828 100644 --- a/srcpkgs/imgbrd-grabber/template +++ b/srcpkgs/imgbrd-grabber/template @@ -1,7 +1,7 @@ # Template file for 'imgbrd-grabber' pkgname=imgbrd-grabber version=7.1.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="nodejs" makedepends="qt5-declarative-devel qt5-multimedia-devel qt5-plugin-mysql From fd0ef308c494af9e0aaf179cb516bcc36ce01dcf Mon Sep 17 00:00:00 2001 From: Mihail Ivanchev Date: Thu, 23 May 2024 14:21:06 +0200 Subject: [PATCH 8/8] nodejs: update to 20.13.1 --- srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++----------------- srcpkgs/nodejs/patches/python312.patch | 19 -------- srcpkgs/nodejs/template | 36 +++++++++++++-- 3 files changed, 44 insertions(+), 62 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/python312.patch diff --git a/srcpkgs/nodejs/patches/cross-aarch64.patch b/srcpkgs/nodejs/patches/cross-aarch64.patch index fa05cb15813e89..93f9a4cd235b11 100644 --- a/srcpkgs/nodejs/patches/cross-aarch64.patch +++ b/srcpkgs/nodejs/patches/cross-aarch64.patch @@ -1,43 +1,14 @@ -From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis -Date: Tue, 6 Dec 2022 11:27:49 +0100 -Subject: [PATCH] build: fix arm64 cross-compilation - -Commit 938212f added -msign-return-address=all to _all_ cflags but that -is wrong when cross-compiling, it should only be added to the target's -cflags. - -Fixes: https://github.com/nodejs/node/issues/42888 ---- - configure.py | 2 -- - node.gyp | 3 +++ - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 40e0395e..9de3148f 100755 ---- a/configure.py -+++ b/configure.py -@@ -1294,9 +1294,7 @@ def configure_node(o): - - o['variables']['want_separate_host_toolset'] = int(cross_compiling) - -- # Enable branch protection for arm64 - if target_arch == 'arm64': -- o['cflags']+=['-msign-return-address=all'] - o['variables']['arm_fpu'] = options.arm_fpu or 'neon' - - if options.node_snapshot_main is not None: diff --git a/node.gyp b/node.gyp -index cf52281b..5218d941 100644 +index 5abbad6c6f..460e4f1a86 100644 --- a/node.gyp +++ b/node.gyp -@@ -112,6 +112,9 @@ - }, - - 'conditions': [ -+ ['target_arch=="arm64"', { -+ 'cflags': ['-msign-return-address=all'], # Pointer authentication. -+ }], - ['OS in "aix os400"', { - 'ldflags': [ - '-Wl,-bnoerrmsg', +@@ -417,6 +417,9 @@ + [ 'node_shared=="true"', { + 'node_target_type%': 'shared_library', + 'conditions': [ ++ ['target_arch=="arm64"', { ++ 'cflags': ['-msign-return-address=all'], # Pointer authentication. ++ }], + ['OS in "aix os400"', { + # For AIX, always generate static library first, + # It needs an extra step to generate exp and diff --git a/srcpkgs/nodejs/patches/python312.patch b/srcpkgs/nodejs/patches/python312.patch deleted file mode 100644 index b5f1d22877f7e4..00000000000000 --- a/srcpkgs/nodejs/patches/python312.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./configure.orig 2023-10-11 07:49:24.971659089 -0400 -+++ ./configure 2023-10-11 07:49:51.615780727 -0400 -@@ -4,6 +4,7 @@ - # 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.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" "$@" - command -v python3.9 >/dev/null && exec python3.9 "$0" "$@" -@@ -23,7 +24,7 @@ - from distutils.spawn import find_executable as which - - print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) --acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) -+acceptable_pythons = ((3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) - if sys.version_info[:2] in acceptable_pythons: - import configure - else: diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 33d4fd11ad8a9e..9e80bfd847cc94 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -1,6 +1,6 @@ # Template file for 'nodejs' pkgname=nodejs -version=18.19.1 +version=20.13.1 revision=1 hostmakedepends="which pkg-config python3-setuptools" _make_depends="zlib-devel $(vopt_if icu icu-devel) @@ -15,7 +15,7 @@ license="MIT" homepage="https://nodejs.org/" changelog="https://raw.githubusercontent.com/nodejs/node/main/doc/changelogs/CHANGELOG_V${version%%.*}.md" distfiles="https://nodejs.org/dist/v${version}/node-v${version}.tar.xz" -checksum=090f96a2ecde080b6b382c6d642bca5d0be4702a78cb555be7bf02b20bd16ded +checksum=791786a09023241cb7e4f7d65ec90aa924bb39141ff7bb6d5a1dedf7def4b4e7 python_version=3 build_options="ssl libuv icu nghttp2 cares brotli" @@ -96,7 +96,37 @@ do_build() { } do_check() { - local CI_SKIP_TESTS="test-child-process-uid-gid.js,test-process-euid-egid.js,test-process-uid-gid.js,test-tls-session-cache.js,test-tls-getprotocol.js,test-tls-alert.js,test-tls-cli-min-version-1.1.js,test-tls-cli-max-version-1.1.js,test-tls-cli-min-version-1.2.js,test-tls-cli-max-version-1.2.js,test-tls-cli-min-version-1.3.js,test-tls-cli-max-version-1.3.js,test-tls-min-max-version.js,test-process-versions.js,test-strace-openat-openssl.js,test-crypto-dh.js,test-dgram-send-cb-quelches-error.js,test-https-agent-session-eviction.js" + local CI_SKIP_TESTS="test-crypto-dh.js,\ +test-cluster-primary-error.js,\ +test-cluster-primary-kill.js,\ +test-https-client-checkServerIdentity.js,\ +test-https-strict.js,\ +test-process-euid-egid.js,\ +test-process-initgroups.js,\ +test-process-setgroups.js,\ +test-process-uid-gid.js,\ +test-tls-alert-handling.js,\ +test-tls-cert-regression.js,\ +test-tls-client-auth.js,\ +test-tls-client-getephemeralkeyinfo.js,\ +test-tls-client-mindhsize.js,\ +test-tls-client-renegotiation-13.js,\ +test-tls-client-verify.js,\ +test-tls-dhe.js,\ +test-tls-empty-sni-context.js,\ +test-tls-enable-trace-cli.js,\ +test-tls-enable-trace.js,\ +test-tls-getcipher.js,\ +test-tls-junk-server.js,\ +test-tls-multi-key.js,\ +test-tls-multiple-cas-as-string.js,\ +test-tls-peer-certificate-encoding.js,\ +test-tls-psk-circuit.js,\ +test-tls-set-ciphers.js,\ +test-tls-server-verify.js,\ +test-tls-sni-server-client.js,\ +test-tls-sni-option.js,\ +test-tls-junk-closes-server.js" # https://github.com/nodejs/node/issues/50741 CI_SKIP_TESTS+=",test-dns-resolveany.js,test-dns-resolveany-bad-ancount.js"