* [PR PATCH] [WIP] nodejs: update to 20.13.1
@ 2024-05-23 12:22 MIvanchev
2024-05-23 12:24 ` [PR PATCH] [Updated] " MIvanchev
` (23 more replies)
0 siblings, 24 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
There is a new pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 1135 bytes --]
From 7e75fc3c2d3832cd20c0f15a731ea5e30a7d9905 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH] nodejs: update to 20.13.1
---
srcpkgs/nodejs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 33d4fd11ad8a9e..69304162ff7184 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
@ 2024-05-23 12:24 ` MIvanchev
2024-05-23 12:35 ` leahneukirchen
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 12:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 1937 bytes --]
From 7e75fc3c2d3832cd20c0f15a731ea5e30a7d9905 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 1/2] nodejs: update to 20.13.1
---
srcpkgs/nodejs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 33d4fd11ad8a9e..69304162ff7184 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"
From b76f80b1427c343fcfea5e1e61f29a9ebfa952b6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 2/2] 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
2024-05-23 12:24 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-05-23 12:35 ` leahneukirchen
2024-05-23 12:48 ` [PR PATCH] [Updated] " MIvanchev
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2024-05-23 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/50485#issuecomment-2127000079
Comment:
Please take a look at https://github.com/void-linux/void-packages/pull/47249/files to see what other changes may be needed.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
2024-05-23 12:24 ` [PR PATCH] [Updated] " MIvanchev
2024-05-23 12:35 ` leahneukirchen
@ 2024-05-23 12:48 ` MIvanchev
2024-05-23 12:52 ` MIvanchev
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 5256 bytes --]
From 500f1b76b266254f7845529b8da5b6f1bffca7be Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 1/4] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 39 +++-------------------
srcpkgs/nodejs/template | 4 +--
2 files changed, 7 insertions(+), 36 deletions(-)
diff --git a/srcpkgs/nodejs/patches/cross-aarch64.patch b/srcpkgs/nodejs/patches/cross-aarch64.patch
index fa05cb15813e89..137835c699df25 100644
--- a/srcpkgs/nodejs/patches/cross-aarch64.patch
+++ b/srcpkgs/nodejs/patches/cross-aarch64.patch
@@ -1,40 +1,11 @@
-From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-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..96eedf1b24 100644
--- a/node.gyp
+++ b/node.gyp
-@@ -112,6 +112,9 @@
- },
-
- 'conditions': [
+@@ -481,6 +481,9 @@
+ }],
+ ],
+ }],
+ ['target_arch=="arm64"', {
+ 'cflags': ['-msign-return-address=all'], # Pointer authentication.
+ }],
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 33d4fd11ad8a9e..69304162ff7184 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"
From b78867f0614728d71c826df90475926f593a05dc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 2/4] 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 84cceab8d22fb90cb575be9f674235877b9482eb Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 3/4] 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 a00c1dc18c252e942167a5bc7add2384588dba62 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (2 preceding siblings ...)
2024-05-23 12:48 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-05-23 12:52 ` MIvanchev
2024-05-23 15:06 ` MIvanchev
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 6532 bytes --]
From d429a8193014c4f0b2d093bb740ef3f537468d89 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 1/4] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 39 +++-------------------
srcpkgs/nodejs/patches/python312.patch | 19 -----------
srcpkgs/nodejs/template | 4 +--
3 files changed, 7 insertions(+), 55 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..137835c699df25 100644
--- a/srcpkgs/nodejs/patches/cross-aarch64.patch
+++ b/srcpkgs/nodejs/patches/cross-aarch64.patch
@@ -1,40 +1,11 @@
-From 6bdf9dc3ec7dbff00acef081f4e3dd3e061fd744 Mon Sep 17 00:00:00 2001
-From: Ben Noordhuis <info@bnoordhuis.nl>
-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..96eedf1b24 100644
--- a/node.gyp
+++ b/node.gyp
-@@ -112,6 +112,9 @@
- },
-
- 'conditions': [
+@@ -481,6 +481,9 @@
+ }],
+ ],
+ }],
+ ['target_arch=="arm64"', {
+ 'cflags': ['-msign-return-address=all'], # Pointer authentication.
+ }],
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..69304162ff7184 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"
From 99d39466a9adb062185882227a8f0efb86273956 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 2/4] 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 d49951a64adc143c7985572864c54af8d1023c5f Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 3/4] 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 116ec3d2b357ef47dc90675e8ef25d7b9b760622 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 4/4] 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (3 preceding siblings ...)
2024-05-23 12:52 ` MIvanchev
@ 2024-05-23 15:06 ` MIvanchev
2024-05-23 19:10 ` MIvanchev
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 6972 bytes --]
From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 1/4] 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 <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 2/4] 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 <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 3/4] 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 3964c58cfed590c7c2d080904a1e3bb65900521a Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 4/4] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 4 +-
3 files changed, 13 insertions(+), 61 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 <info@bnoordhuis.nl>
-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..69304162ff7184 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (4 preceding siblings ...)
2024-05-23 15:06 ` MIvanchev
@ 2024-05-23 19:10 ` MIvanchev
2024-05-23 20:38 ` MIvanchev
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 19:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 8407 bytes --]
From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 1/4] 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 <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 2/4] 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 <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 3/4] 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 62e94cb9681026428f5d63c804b294b777eda9ab Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 4/4] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 8 ++--
3 files changed, 15 insertions(+), 63 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 <info@bnoordhuis.nl>
-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..1a05ec9a3d390a 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,10 +96,10 @@ 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-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"
# https://github.com/nodejs/node/issues/50741
- CI_SKIP_TESTS+=",test-dns-resolveany.js,test-dns-resolveany-bad-ancount.js"
+ CI_SKIP_TESTS+="test-dns-resolveany.js,test-dns-resolveany-bad-ancount.js"
if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
# https://github.com/nodejs/node/issues/45906
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (5 preceding siblings ...)
2024-05-23 19:10 ` MIvanchev
@ 2024-05-23 20:38 ` MIvanchev
2024-05-23 21:27 ` MIvanchev
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 11487 bytes --]
From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 9ac78f562f63cd311df77d9665d75fac31b535b2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <info@bnoordhuis.nl>
-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..b699f3d5021e54 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (6 preceding siblings ...)
2024-05-23 20:38 ` MIvanchev
@ 2024-05-23 21:27 ` MIvanchev
2024-05-23 21:29 ` MIvanchev
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 11444 bytes --]
From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 89fc83ff1d2b636430f895152ceb2b845f28bb32 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 6 +--
3 files changed, 14 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 <info@bnoordhuis.nl>
-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..4082156182d56e 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,7 @@ 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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (7 preceding siblings ...)
2024-05-23 21:27 ` MIvanchev
@ 2024-05-23 21:29 ` MIvanchev
2024-05-24 8:05 ` MIvanchev
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-23 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 11547 bytes --]
From 8e4944adf815cb5f8cf5321a44d5155800bf107e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <contact@ivanchev.net>
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 <info@bnoordhuis.nl>
-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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (8 preceding siblings ...)
2024-05-23 21:29 ` MIvanchev
@ 2024-05-24 8:05 ` MIvanchev
2024-05-24 8:06 ` MIvanchev
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 8:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 12217 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 afadd270bfab04b6dc5eecc64ad3b23f419efc85 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 5/8] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..a9623f156b7c07 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
+version=6.2.8
+revision=2
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
short_desc="Keybase desktop client"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 5e46680ba4925c3ce13c9971580f7e922ff5cde8 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 e204e5e86cd35c5f0a14a96d7d8a22400d0bbdb1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 67fa7762ab4dc199f940cd134942f2fc8367e668 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <info@bnoordhuis.nl>
-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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (9 preceding siblings ...)
2024-05-24 8:05 ` MIvanchev
@ 2024-05-24 8:06 ` MIvanchev
2024-05-24 8:08 ` MIvanchev
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 8:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 12166 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 aeae16f1adb8275be672a6e8806da4ca6c02d1e2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 5/8] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From a4d2e01d4465afcac455b82f81f92611c01c9222 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 ade80d455864dce3db04813ba63aa5cf5d383349 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 f351dcaa2867e9951bd4f590c0671a97f78a5b70 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <info@bnoordhuis.nl>
-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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (10 preceding siblings ...)
2024-05-24 8:06 ` MIvanchev
@ 2024-05-24 8:08 ` MIvanchev
2024-05-24 10:02 ` MIvanchev
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 8:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 12166 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 4a9e9c5e2a2ad3cc3a74b59ea54344519c82b6c6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 5/8] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8821ff2b07bfcdc7ee4c2d9a4e8e23cf9b0a162c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 e885abb08b00fcf60175afd632d9210ccb7fffff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 1170aed60f2eb226ebedf09b4c2d67efeea762a4 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 <info@bnoordhuis.nl>
-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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (11 preceding siblings ...)
2024-05-24 8:08 ` MIvanchev
@ 2024-05-24 10:02 ` MIvanchev
2024-05-24 10:11 ` MIvanchev
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 10:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 20368 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/19] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/19] 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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/19] 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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/19] 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 4a9e9c5e2a2ad3cc3a74b59ea54344519c82b6c6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/19] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8821ff2b07bfcdc7ee4c2d9a4e8e23cf9b0a162c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/19] 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 e885abb08b00fcf60175afd632d9210ccb7fffff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/19] 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 5693c3265f25678e8782b70b78d26bdf760be4a9 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/19] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From 8909a123a21e047835e7db7509f5bbcfa68c2543 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/19] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 623c803a7b46a2967a4e8b8404996c9bf21d4ca0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/19] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From 32d288dc6bcbdc326078f514e59213d67d2a791b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/19] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From 6ebf0cd3cfdeff415b3e75f59ff49d04ea28b727 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/19] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From b12e4dc7575f119440fd22863531c5230c8858f2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:36 +0200
Subject: [PATCH 13/19] qt6-pdf: rebuild for new nodejs version
---
srcpkgs/qt6-pdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template
index ecda84afac1310..531b4e1d4fe84d 100644
--- a/srcpkgs/qt6-pdf/template
+++ b/srcpkgs/qt6-pdf/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-pdf'
pkgname=qt6-pdf
version=6.6.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DQT_FEATURE_qtpdf_build=ON
-DQT_FEATURE_qtpdf_widgets_build=ON
From c0a6141d98e49d9a3d33509bf5d391ae3b1bd4ed Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 14/19] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From c4430033e4bdb59e0d4c8b3abdb1facf5ed0b697 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:11 +0200
Subject: [PATCH 15/19] qt5-webengine: rebuild for new nodejs version
---
srcpkgs/qt5-webengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 3c0f5bda69c7ee..44ccec2fb78a63 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
version=5.15.16
-revision=1
+revision=2
_version="${version}-lts"
_chromium_commit=207c2ac45ca3386d153770c6b0d2ea2ec21ca880
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
From 341169e1483538329862915af3ad55803103b32d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 16/19] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From 712b5d0b9fbac6e75e600427f86990a942cd70ae Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 17/19] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From ae22dcdd4b12f0de009d6beae4fe3dcfeec6461c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:02:02 +0200
Subject: [PATCH 18/19] vscode: rebuild for new nodejs version
---
srcpkgs/vscode/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 0216040fb1eda6..f0abcc0fac74f1 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,7 +1,7 @@
# Template file for 'vscode'
pkgname=vscode
version=1.89.0
-revision=1
+revision=2
_electronver=24.3.0
_npmver=8.6.0
hostmakedepends="pkg-config python3 python3-setuptools nodejs yarn tar git ripgrep"
From 416dc36ebc7b5f2aeb386f0b5d7818eaf42b3d69 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 19/19] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (12 preceding siblings ...)
2024-05-24 10:02 ` MIvanchev
@ 2024-05-24 10:11 ` MIvanchev
2024-05-24 14:11 ` MIvanchev
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 10:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 18913 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/17] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/17] 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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/17] 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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/17] 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 4a9e9c5e2a2ad3cc3a74b59ea54344519c82b6c6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/17] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8821ff2b07bfcdc7ee4c2d9a4e8e23cf9b0a162c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/17] 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 e885abb08b00fcf60175afd632d9210ccb7fffff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/17] 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 5693c3265f25678e8782b70b78d26bdf760be4a9 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/17] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From 8909a123a21e047835e7db7509f5bbcfa68c2543 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/17] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 623c803a7b46a2967a4e8b8404996c9bf21d4ca0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/17] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From 32d288dc6bcbdc326078f514e59213d67d2a791b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/17] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From 6ebf0cd3cfdeff415b3e75f59ff49d04ea28b727 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/17] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From b12e4dc7575f119440fd22863531c5230c8858f2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:36 +0200
Subject: [PATCH 13/17] qt6-pdf: rebuild for new nodejs version
---
srcpkgs/qt6-pdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template
index ecda84afac1310..531b4e1d4fe84d 100644
--- a/srcpkgs/qt6-pdf/template
+++ b/srcpkgs/qt6-pdf/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-pdf'
pkgname=qt6-pdf
version=6.6.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DQT_FEATURE_qtpdf_build=ON
-DQT_FEATURE_qtpdf_widgets_build=ON
From c0a6141d98e49d9a3d33509bf5d391ae3b1bd4ed Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 14/17] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From 502bddfe4722c6608905a5c521d903acc6243b52 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 15/17] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From 94d094e2419152016f1d8262068bedb4dc91718b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 16/17] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From 5068a5096fe8b9d140aa530c4e0b6531fe47a676 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 17/17] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (13 preceding siblings ...)
2024-05-24 10:11 ` MIvanchev
@ 2024-05-24 14:11 ` MIvanchev
2024-05-24 14:15 ` MIvanchev
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 18913 bytes --]
From 09d4ce09bcc98266705a99b4c8c73f2c5b53aab6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/17] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From f07792f5bcded55afbdd0431dce6841edcc42c22 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/17] 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 dd426c8b4721e828e54c08d83376513e97b4860b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/17] 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 b5eaa141eba0baebd05180019702c83f6e85455b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/17] 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 4a9e9c5e2a2ad3cc3a74b59ea54344519c82b6c6 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/17] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8821ff2b07bfcdc7ee4c2d9a4e8e23cf9b0a162c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/17] 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 e885abb08b00fcf60175afd632d9210ccb7fffff Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/17] 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 5693c3265f25678e8782b70b78d26bdf760be4a9 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/17] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From 8909a123a21e047835e7db7509f5bbcfa68c2543 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/17] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 623c803a7b46a2967a4e8b8404996c9bf21d4ca0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/17] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From 32d288dc6bcbdc326078f514e59213d67d2a791b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/17] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From 6ebf0cd3cfdeff415b3e75f59ff49d04ea28b727 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/17] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From b12e4dc7575f119440fd22863531c5230c8858f2 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:36 +0200
Subject: [PATCH 13/17] qt6-pdf: rebuild for new nodejs version
---
srcpkgs/qt6-pdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-pdf/template b/srcpkgs/qt6-pdf/template
index ecda84afac1310..531b4e1d4fe84d 100644
--- a/srcpkgs/qt6-pdf/template
+++ b/srcpkgs/qt6-pdf/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-pdf'
pkgname=qt6-pdf
version=6.6.0
-revision=3
+revision=4
build_style=cmake
configure_args="-DQT_FEATURE_qtpdf_build=ON
-DQT_FEATURE_qtpdf_widgets_build=ON
From c0a6141d98e49d9a3d33509bf5d391ae3b1bd4ed Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 14/17] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From 502bddfe4722c6608905a5c521d903acc6243b52 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 15/17] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From 94d094e2419152016f1d8262068bedb4dc91718b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 16/17] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From 0a8a31e1262f3e0f5d460870878f2b5433f5d776 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 17/17] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (14 preceding siblings ...)
2024-05-24 14:11 ` MIvanchev
@ 2024-05-24 14:15 ` MIvanchev
2024-05-25 9:00 ` MIvanchev
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-24 14:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 18233 bytes --]
From f996c8674472a4948197bd44d98a46f2076f7e63 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/16] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From 3c526bf565982da43d75ae4280a079c37b91e72e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/16] 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 5209a37f9c6c8cf6a739d58d307b8ec553b2e6aa Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/16] 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 c1c5219944039b6788b386baea745b0ccedb909b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/16] 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 03c204d82644a83c3d4effdeac35cd17d9d98120 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/16] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8b785809e9515cb9696608e15e3946ed81376d24 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/16] 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 28e94ffc9d5139906159871d653c77fbf0d29060 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/16] 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 f4069fe1e02e7d9356506cf65d46a0a108c56b3b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/16] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From c05213053779ddc5501bbd5d3331cfab74aaade1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/16] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 14bb4b1d84b13d0f59788306e6e69278d15c0bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/16] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From ecab08615641554caf5a489b493809e26d428b7e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/16] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From ca47d5a1b3d8467523e184ba4d02ee1ce999e95d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/16] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From d51c0b94b17715b8c2327f1055ddf8a65ccf2fe8 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 13/16] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From 6f631a22ac344c64b0a25d7dfcb5b93832107ac4 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 14/16] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From e5238a63312e9afb7c59ad6a4e8dd534e90e2044 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 15/16] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From 5e689816dc2f05e494fe7f99f56c81f9cf056b46 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 16/16] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (15 preceding siblings ...)
2024-05-24 14:15 ` MIvanchev
@ 2024-05-25 9:00 ` MIvanchev
2024-05-25 10:37 ` MIvanchev
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-25 9:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 18233 bytes --]
From f996c8674472a4948197bd44d98a46f2076f7e63 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/16] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From 3c526bf565982da43d75ae4280a079c37b91e72e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/16] 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 5209a37f9c6c8cf6a739d58d307b8ec553b2e6aa Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/16] 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 c1c5219944039b6788b386baea745b0ccedb909b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/16] 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 03c204d82644a83c3d4effdeac35cd17d9d98120 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/16] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8b785809e9515cb9696608e15e3946ed81376d24 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/16] 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 28e94ffc9d5139906159871d653c77fbf0d29060 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/16] 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 f4069fe1e02e7d9356506cf65d46a0a108c56b3b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/16] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From c05213053779ddc5501bbd5d3331cfab74aaade1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/16] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 14bb4b1d84b13d0f59788306e6e69278d15c0bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/16] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From ecab08615641554caf5a489b493809e26d428b7e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/16] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From ca47d5a1b3d8467523e184ba4d02ee1ce999e95d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/16] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From d51c0b94b17715b8c2327f1055ddf8a65ccf2fe8 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 13/16] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From 6f631a22ac344c64b0a25d7dfcb5b93832107ac4 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 14/16] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From e5238a63312e9afb7c59ad6a4e8dd534e90e2044 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 15/16] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From 129de163cd671bec06d973ada291e1369a4f7815 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 16/16] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (16 preceding siblings ...)
2024-05-25 9:00 ` MIvanchev
@ 2024-05-25 10:37 ` MIvanchev
2024-05-25 11:06 ` MIvanchev
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-25 10:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 18233 bytes --]
From f996c8674472a4948197bd44d98a46f2076f7e63 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/16] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From 3c526bf565982da43d75ae4280a079c37b91e72e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/16] 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 5209a37f9c6c8cf6a739d58d307b8ec553b2e6aa Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/16] 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 c1c5219944039b6788b386baea745b0ccedb909b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/16] 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 03c204d82644a83c3d4effdeac35cd17d9d98120 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/16] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8b785809e9515cb9696608e15e3946ed81376d24 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/16] 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 28e94ffc9d5139906159871d653c77fbf0d29060 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/16] 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 f4069fe1e02e7d9356506cf65d46a0a108c56b3b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/16] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From c05213053779ddc5501bbd5d3331cfab74aaade1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/16] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 14bb4b1d84b13d0f59788306e6e69278d15c0bc0 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 10/16] element-desktop: rebuild for new nodejs version
---
srcpkgs/element-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index aa187913ebbd8f..d4afaaf3ded1e5 100644
--- a/srcpkgs/element-desktop/template
+++ b/srcpkgs/element-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'element-desktop'
pkgname=element-desktop
version=1.11.43
-revision=1
+revision=2
create_wrksrc=yes
conf_files="/etc/${pkgname}/config.json"
hostmakedepends="git yarn nodejs rust cargo python3 curl
From ecab08615641554caf5a489b493809e26d428b7e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:12 +0200
Subject: [PATCH 11/16] pnpm: rebuild for new nodejs version
---
srcpkgs/pnpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 50833d4950d99c..18d4515ff8fc4c 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,7 +1,7 @@
# Template file for 'pnpm'
pkgname=pnpm
version=9.1.1
-revision=1
+revision=2
build_style=fetch
hostmakedepends="nodejs jq"
depends="nodejs"
From ca47d5a1b3d8467523e184ba4d02ee1ce999e95d Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:24 +0200
Subject: [PATCH 12/16] pyright: rebuild for new nodejs version
---
srcpkgs/pyright/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyright/template b/srcpkgs/pyright/template
index da4e72aead06b7..649fd6b3442850 100644
--- a/srcpkgs/pyright/template
+++ b/srcpkgs/pyright/template
@@ -1,7 +1,7 @@
# Template file for 'pyright'
pkgname=pyright
version=1.1.362
-revision=1
+revision=2
build_wrksrc="packages/pyright"
hostmakedepends="nodejs python3"
depends="nodejs"
From d51c0b94b17715b8c2327f1055ddf8a65ccf2fe8 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:00:51 +0200
Subject: [PATCH 13/16] rapydscript-ng: rebuild for new nodejs version
---
srcpkgs/rapydscript-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rapydscript-ng/template b/srcpkgs/rapydscript-ng/template
index 1d5f4faab2c630..0558377851a775 100644
--- a/srcpkgs/rapydscript-ng/template
+++ b/srcpkgs/rapydscript-ng/template
@@ -1,7 +1,7 @@
# Template file for 'rapydscript-ng'
pkgname=rapydscript-ng
version=0.7.20
-revision=3
+revision=4
hostmakedepends="nodejs"
depends="nodejs"
short_desc="Transpiler for a Python like language to JavaScript"
From 6f631a22ac344c64b0a25d7dfcb5b93832107ac4 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:23 +0200
Subject: [PATCH 14/16] spreed-webrtc: rebuild for new nodejs version
---
srcpkgs/spreed-webrtc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template
index 170d1e1e430a21..4a17b5474f939a 100644
--- a/srcpkgs/spreed-webrtc/template
+++ b/srcpkgs/spreed-webrtc/template
@@ -1,7 +1,7 @@
# Template file for 'spreed-webrtc'
pkgname=spreed-webrtc
version=0.29.7
-revision=12
+revision=13
build_style=go
go_import_path="github.com/strukturag/spreed-webrtc"
go_package="${go_import_path}/src/app/spreed-webrtc-server"
From e5238a63312e9afb7c59ad6a4e8dd534e90e2044 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 12:01:45 +0200
Subject: [PATCH 15/16] wire-desktop: rebuild for new nodejs version
---
srcpkgs/wire-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 015aea0ce209e0..70fbde0d880caa 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'wire-desktop'
pkgname=wire-desktop
version=3.34.3307
-revision=1
+revision=2
hostmakedepends="nodejs yarn git"
depends="electron24"
short_desc="Wire for desktop"
From 8058e6a29ff346e5fb7e42694767f7b673f822dc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 16/16] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (17 preceding siblings ...)
2024-05-25 10:37 ` MIvanchev
@ 2024-05-25 11:06 ` MIvanchev
2024-05-25 12:50 ` MIvanchev
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-25 11:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 13970 bytes --]
From f996c8674472a4948197bd44d98a46f2076f7e63 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:24:32 +0200
Subject: [PATCH 01/10] Rocket.Chat: rebuild for new nodejs version
---
srcpkgs/Rocket.Chat-Desktop/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From 3c526bf565982da43d75ae4280a079c37b91e72e Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:26:40 +0200
Subject: [PATCH 02/10] 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 5209a37f9c6c8cf6a739d58d307b8ec553b2e6aa Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:27:18 +0200
Subject: [PATCH 03/10] 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 c1c5219944039b6788b386baea745b0ccedb909b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:04 +0200
Subject: [PATCH 04/10] 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 03c204d82644a83c3d4effdeac35cd17d9d98120 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 05/10] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 8b785809e9515cb9696608e15e3946ed81376d24 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:48 +0200
Subject: [PATCH 06/10] 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 28e94ffc9d5139906159871d653c77fbf0d29060 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:37:14 +0200
Subject: [PATCH 07/10] 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 f4069fe1e02e7d9356506cf65d46a0a108c56b3b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:16 +0200
Subject: [PATCH 08/10] electron19: rebuild for new nodejs version
---
srcpkgs/electron19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b1fdb63cb67d46..881f04d7d825b7 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -1,7 +1,7 @@
# Template file for 'electron19'
pkgname=electron19
version=19.0.8
-revision=4
+revision=5
_nodever=16.14.2
_chromiumver=102.0.5005.125
archs="x86_64* aarch64* ppc64le*"
From c05213053779ddc5501bbd5d3331cfab74aaade1 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Fri, 24 May 2024 11:56:26 +0200
Subject: [PATCH 09/10] electron24: rebuild for new nodejs version
---
srcpkgs/electron24/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index eafb9a0c696131..42b57dc512d822 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -1,7 +1,7 @@
# Template file for 'electron24'
pkgname=electron24
version=24.3.0
-revision=3
+revision=4
_nodever=18.14.0
_chromiumver=112.0.5615.165
archs="x86_64* aarch64*"
From 6dd0b29facb136f2f844fac7587edd8e9eeff79b Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH 10/10] nodejs: update to 20.13.1
---
srcpkgs/nodejs/patches/cross-aarch64.patch | 51 +++++-----------------
srcpkgs/nodejs/patches/python312.patch | 19 --------
srcpkgs/nodejs/template | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (18 preceding siblings ...)
2024-05-25 11:06 ` MIvanchev
@ 2024-05-25 12:50 ` MIvanchev
2024-05-25 14:08 ` leahneukirchen
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-25 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/50485#issuecomment-2131244428
Comment:
@leahneukirchen It appears electron no longer builds but I thing for an unrelated reason, i.e.
```
In file included from ../../third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc:16:
../../third_party/abseil-cpp/absl/strings/internal/str_format/extension.h:34:35: error: unknown type name 'uint8_t'
```
Do you have an clue to this?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (19 preceding siblings ...)
2024-05-25 12:50 ` MIvanchev
@ 2024-05-25 14:08 ` leahneukirchen
2024-05-25 14:10 ` leahneukirchen
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2024-05-25 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/50485#issuecomment-2131285554
Comment:
That needs a `#include <stdint.h>` somewhere.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (20 preceding siblings ...)
2024-05-25 14:08 ` leahneukirchen
@ 2024-05-25 14:10 ` leahneukirchen
2024-05-30 9:40 ` [PR PATCH] [Updated] " MIvanchev
2024-05-30 11:59 ` MIvanchev
23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2024-05-25 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/50485#issuecomment-2131285554
Comment:
That needs a `#include <cstdint>` somewhere.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (21 preceding siblings ...)
2024-05-25 14:10 ` leahneukirchen
@ 2024-05-30 9:40 ` MIvanchev
2024-05-30 11:59 ` MIvanchev
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-30 9:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
There is an updated pull request by MIvanchev against master on the void-packages repository
https://github.com/MIvanchev/void-packages nodejs
https://github.com/void-linux/void-packages/pull/50485
[WIP] nodejs: update to 20.13.1
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/50485.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-50485.patch --]
[-- Type: text/x-diff, Size: 12593 bytes --]
From eb576050243683399de78c45005593f6ee2f38f7 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Rocket.Chat-Desktop/template b/srcpkgs/Rocket.Chat-Desktop/template
index d7ecb67b7473f3..d59851bc87f946 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"
@@ -31,6 +31,7 @@ do_configure() {
do_build() {
export NODE_ENV=production
+ export NODE_OPTIONS=--openssl-legacy-provider
yarn build
yarn run electron-builder --linux --x64 --dir \
-c.electronDist=/usr/lib/electron${_electron_ver} \
From d835c1cda34fc057f393744171779dda74f0a48c Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 0c4f0885c9e1e154e0c667c332741375260bd642 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 f2801e3f0171ca919c93048007c727e763bd3bfc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 2fd13e14b85e248a2548bbddcd97d90a893d0eec Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 23 May 2024 21:36:25 +0200
Subject: [PATCH 5/8] keybase-desktop: rebuild for new nodejs version
---
srcpkgs/keybase-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keybase-desktop/template b/srcpkgs/keybase-desktop/template
index 21e711e5eddee7..2100fdd2e9e5f3 100644
--- a/srcpkgs/keybase-desktop/template
+++ b/srcpkgs/keybase-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'keybase-desktop'
pkgname=keybase-desktop
-version=6.0.2
+version=6.2.8
revision=1
hostmakedepends="git nodejs yarn unzip"
depends="keybase kbfs"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://keybase.io"
distfiles="https://github.com/keybase/client/archive/v${version}.tar.gz"
-checksum=bdc42b44727614d92768aaaf1ea4e0f01c6b24d5a478bb4b89e0abc93bc67ed5
+checksum=80a47309535d6479d046c80ca7d2ee3dded6ad71c47aee90710640b93cc829ba
nostrip_files="Keybase"
case "${XBPS_TARGET_MACHINE}" in
From 43e9ca3d9f2e3aeb44083115d382dc7998cbf7a7 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 fbb9a39f1c94beac314619313f5a2acbd4b85f56 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 19ef416587742d4e54abe1cd3e4a685f89834870 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
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 | 45 ++++++++++++++++---
3 files changed, 50 insertions(+), 65 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 <info@bnoordhuis.nl>
-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..5578c8653c640f 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,11 +1,14 @@
# 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)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)
+_make_depends="zlib-devel \
+ $(vopt_if icu icu-devel) \
+ $(vopt_if ssl openssl-devel) \
+ $(vopt_if libuv libuv-devel) \
+ $(vopt_if nghttp2 nghttp2-devel) \
+ $(vopt_if cares c-ares-devel) \
$(vopt_if brotli brotli-devel)"
makedepends="${_make_depends}"
checkdepends="procps-ng iana-etc"
@@ -15,7 +18,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 +99,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"
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: nodejs: update to 20.13.1
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
` (22 preceding siblings ...)
2024-05-30 9:40 ` [PR PATCH] [Updated] " MIvanchev
@ 2024-05-30 11:59 ` MIvanchev
23 siblings, 0 replies; 25+ messages in thread
From: MIvanchev @ 2024-05-30 11:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New comment by MIvanchev on void-packages repository
https://github.com/void-linux/void-packages/pull/50485#issuecomment-2139400798
Comment:
I'm removing the WIP status here and arguing that a significant number of projects continue to build successfully with the updated nodejs.
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-05-30 11:59 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-23 12:22 [PR PATCH] [WIP] nodejs: update to 20.13.1 MIvanchev
2024-05-23 12:24 ` [PR PATCH] [Updated] " MIvanchev
2024-05-23 12:35 ` leahneukirchen
2024-05-23 12:48 ` [PR PATCH] [Updated] " MIvanchev
2024-05-23 12:52 ` MIvanchev
2024-05-23 15:06 ` MIvanchev
2024-05-23 19:10 ` MIvanchev
2024-05-23 20:38 ` MIvanchev
2024-05-23 21:27 ` MIvanchev
2024-05-23 21:29 ` MIvanchev
2024-05-24 8:05 ` MIvanchev
2024-05-24 8:06 ` MIvanchev
2024-05-24 8:08 ` MIvanchev
2024-05-24 10:02 ` MIvanchev
2024-05-24 10:11 ` MIvanchev
2024-05-24 14:11 ` MIvanchev
2024-05-24 14:15 ` MIvanchev
2024-05-25 9:00 ` MIvanchev
2024-05-25 10:37 ` MIvanchev
2024-05-25 11:06 ` MIvanchev
2024-05-25 12:50 ` MIvanchev
2024-05-25 14:08 ` leahneukirchen
2024-05-25 14:10 ` leahneukirchen
2024-05-30 9:40 ` [PR PATCH] [Updated] " MIvanchev
2024-05-30 11:59 ` MIvanchev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).