Skip to content

Commit 88b42c4

Browse files
kxxtkxxt
committed
addpatch: nodejs-lts-iron 20.20.0-1
- Backport chromium-review.googlesource.com/c/v8/v8/+/7540554 to fix the long-standing nodejs heisenbug Sporadic Nodejs segfault on sg2042 revyos/revyos#27. Upstream PR: nodejs/node#61687 - `--nocheck` is needed. There are test failures.
1 parent 4f3679b commit 88b42c4

3 files changed

Lines changed: 160 additions & 0 deletions

File tree

‎nodejs-lts-iron/py314.diff‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From 910b92ba02420cc039f39e6c6907557edd185107 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=
3+
<[email protected]>
4+
Date: Sun, 22 Jun 2025 07:49:14 +0200
5+
Subject: [PATCH] tools: make nodedownload module compatible with Python 3.14
6+
7+
FancyURLopener and URLopener have been deprecated since
8+
Python 3.3 and they are removed completely from 3.14.
9+
10+
Fixes: https://github.com/nodejs/node/issues/58740
11+
PR-URL: https://github.com/nodejs/node/pull/58752
12+
Reviewed-By: Luigi Pinca <[email protected]>
13+
Reviewed-By: Yagiz Nizipli <[email protected]>
14+
Reviewed-By: James M Snell <[email protected]>
15+
---
16+
tools/configure.d/nodedownload.py | 15 +++++----------
17+
1 file changed, 5 insertions(+), 10 deletions(-)
18+
19+
diff --git a/tools/configure.d/nodedownload.py b/tools/configure.d/nodedownload.py
20+
index 4f144e0e4b4..0d65c33606b 100644
21+
--- a/tools/configure.d/nodedownload.py
22+
+++ b/tools/configure.d/nodedownload.py
23+
@@ -7,10 +7,7 @@ import sys
24+
import zipfile
25+
import tarfile
26+
import contextlib
27+
-try:
28+
- from urllib.request import FancyURLopener, URLopener
29+
-except ImportError:
30+
- from urllib import FancyURLopener, URLopener
31+
+from urllib.request import build_opener, install_opener, urlretrieve
32+
33+
def formatSize(amt):
34+
"""Format a size as a string in MB"""
35+
@@ -21,11 +18,6 @@ def spin(c):
36+
spin = ".:|'"
37+
return (spin[c % len(spin)])
38+
39+
-class ConfigOpener(FancyURLopener):
40+
- """fancy opener used by retrievefile. Set a UA"""
41+
- # append to existing version (UA)
42+
- version = '%s node.js/configure' % URLopener.version
43+
-
44+
def reporthook(count, size, total):
45+
"""internal hook used by retrievefile"""
46+
sys.stdout.write(' Fetch: %c %sMB total, %sMB downloaded \r' %
47+
@@ -38,7 +30,10 @@ def retrievefile(url, targetfile):
48+
try:
49+
sys.stdout.write(' <%s>\nConnecting...\r' % url)
50+
sys.stdout.flush()
51+
- ConfigOpener().retrieve(url, targetfile, reporthook=reporthook)
52+
+ opener = build_opener()
53+
+ opener.addheaders = [('User-agent', f'Python-urllib/{sys.version_info.major}.{sys.version_info.minor} node.js/configure')]
54+
+ install_opener(opener)
55+
+ urlretrieve(url, targetfile, reporthook=reporthook)
56+
print('') # clear the line
57+
return targetfile
58+
except IOError as err:
59+
--
60+
2.53.0
61+
62+
--- a/configure 2026-01-13 02:01:31.000000000 +0000
63+
+++ b/configure 2026-02-04 05:46:05.729484536 +0000
64+
@@ -25,7 +25,7 @@
65+
from distutils.spawn import find_executable as which
66+
67+
print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
68+
-acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
69+
+acceptable_pythons = ((3, 14), (3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
70+
if sys.version_info[:2] in acceptable_pythons:
71+
import configure
72+
else:

‎nodejs-lts-iron/riscv-v8-fix-sp.patch‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
From 5993c41044f4998f072cfa411aa83ba9c2bd94e6 Mon Sep 17 00:00:00 2001
2+
From: Vivian Wang <[email protected]>
3+
Date: Tue, 3 Feb 2026 16:46:02 +0800
4+
Subject: [PATCH] deps: V8: backport 6a0a25abaed3
5+
6+
Original commit message:
7+
8+
[riscv] Fix sp handling in MacroAssembler::LeaveFrame
9+
10+
Keep sp <= fp to ensure that data right above fp doesn't get clobbered
11+
by an inopportune signal and its handler.
12+
13+
Such clobbering can happen in e.g. Node.js when JIT-compiled code is
14+
interrupted by a SIGCHLD handler.
15+
16+
Bug: None
17+
Change-Id: Ief0836032ada7942e89f081f7605f61632c4d414
18+
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7540554
19+
Reviewed-by: Ji Qiu <[email protected]>
20+
Commit-Queue: Yahan Lu (LuYahan) <[email protected]>
21+
Reviewed-by: Rezvan Mahdavi Hezaveh <[email protected]>
22+
Cr-Commit-Position: refs/heads/main@{#105069}
23+
24+
Refs: https://github.com/v8/v8/commit/6a0a25abaed397f83eb0d92e4b33a5e18204f8bc
25+
Co-authored-by: kxxt <[email protected]>
26+
---
27+
deps/v8/AUTHORS | 1 +
28+
deps/v8/src/codegen/riscv/macro-assembler-riscv.cc | 3 ++-
29+
3 files changed, 4 insertions(+), 2 deletions(-)
30+
31+
diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS
32+
index eeac21260b7..1944b3d39aa 100644
33+
--- a/deps/v8/AUTHORS
34+
+++ b/deps/v8/AUTHORS
35+
@@ -264,6 +264,7 @@ Vadim Gorbachev <[email protected]>
36+
Varun Varada <[email protected]>
37+
Victor Costan <[email protected]>
38+
Victor Polevoy <[email protected]>
39+
+Vivian Wang <[email protected]>
40+
Vlad Burlik <[email protected]>
41+
Vladimir Krivosheev <[email protected]>
42+
Vladimir Shutoff <[email protected]>
43+
diff --git a/deps/v8/src/codegen/riscv/macro-assembler-riscv.cc b/deps/v8/src/codegen/riscv/macro-assembler-riscv.cc
44+
index b39661c7715..7f09d052920 100644
45+
--- a/deps/v8/src/codegen/riscv/macro-assembler-riscv.cc
46+
+++ b/deps/v8/src/codegen/riscv/macro-assembler-riscv.cc
47+
@@ -5530,9 +5530,10 @@ void MacroAssembler::EnterFrame(StackFrame::Type type) {
48+
49+
void MacroAssembler::LeaveFrame(StackFrame::Type type) {
50+
ASM_CODE_COMMENT(this);
51+
- addi(sp, fp, 2 * kSystemPointerSize);
52+
+ Move(sp, fp);
53+
LoadWord(ra, MemOperand(fp, 1 * kSystemPointerSize));
54+
LoadWord(fp, MemOperand(fp, 0 * kSystemPointerSize));
55+
+ AddWord(sp, sp, 2 * kSystemPointerSize);
56+
}
57+
58+
void MacroAssembler::EnterExitFrame(int stack_space,
59+
--
60+
2.53.0
61+

‎nodejs-lts-iron/riscv64.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--- PKGBUILD
2+
+++ PKGBUILD
3+
@@ -19,10 +19,14 @@ conflicts=(nodejs)
4+
source=(
5+
"https://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.xz"
6+
update-icu-tests.patch
7+
+ riscv-v8-fix-sp.patch
8+
+ py314.diff
9+
)
10+
# https://nodejs.org/download/release/latest-iron/SHASUMS256.txt.asc
11+
sha256sums=('5294d9d2915620e819e6892fd7e545b98d650bad36dae54e6527eaac482add98'
12+
- '43da0fb7469e34a239b2711876475f303a4012151e44f72e636a5a7fcf21bff8')
13+
+ '43da0fb7469e34a239b2711876475f303a4012151e44f72e636a5a7fcf21bff8'
14+
+ '22e9274034d8c9267f62c9ac0305e8e6c022cce52495e729b2a07c40232d0210'
15+
+ '099d072ec981ecb784b1eb2823fdcdd47577c85f0a32a896e094ef9a9d12424a')
16+
17+
_set_flags() {
18+
# /usr/lib/libnode.so uses malloc_usable_size, which is incompatible with fortification level 3
19+
@@ -32,6 +36,8 @@ _set_flags() {
20+
21+
prepare() {
22+
cd node-v${pkgver}
23+
+ patch -Np1 -i ../py314.diff
24+
+ patch -Np1 -i ../riscv-v8-fix-sp.patch
25+
# Update ICU tests https://github.com/nodejs/node/pull/60523
26+
patch -Np1 -i ../update-icu-tests.patch
27+
}

0 commit comments

Comments
 (0)