From: Peter Michael Green Date: Thu, 26 Feb 2026 20:11:06 +0000 (+0000) Subject: Manual merge of version 20.19.2+dfsg-1+rpi1 and 22.22.0+dfsg+~cs22.19.6-1 to produce... X-Git-Tag: archive/raspbian/22.22.0+dfsg+_cs22.19.6-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=030d1e67f43da8900511d8f472c15abfe7fc501f;p=nodejs.git Manual merge of version 20.19.2+dfsg-1+rpi1 and 22.22.0+dfsg+~cs22.19.6-1 to produce 22.22.0+dfsg+~cs22.19.6-1+rpi1 --- 07444c84702126acbf5848040901b584c665930b diff --cc debian/changelog index 1ff99699a,c95f8be8b..05d61805a --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,176 +1,185 @@@ - nodejs (20.19.2+dfsg-1+rpi1) trixie-staging; urgency=medium ++nodejs (22.22.0+dfsg+~cs22.19.6-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 18.10.0+dfsg-6+rpi1 by Peter Michael Green at Tue, 15 Nov 2022 03:51:54 +0000] + * Set --with-arm-version=6 on raspbian. + * Use armv6k CFLAGS on raspbian. + * Disable testsuite. + - -- Raspbian forward porter Fri, 06 Jun 2025 06:09:46 +0000 ++ -- Peter Michael Green Thu, 26 Feb 2026 20:09:18 +0000 ++ + nodejs (22.22.0+dfsg+~cs22.19.6-1) unstable; urgency=medium + + * New upstream version 22.22.0+dfsg+~cs22.19.6 + + CVE-2025-59465 lib: add TLSSocket default error handler + + CVE-2025-55132 lib: disable futimes when permission model is enabled + + CVE-2025-55130 lib,permission: require full read and write to symlink APIs + + CVE-2025-59466 src: rethrow stack overflow exceptions in async_hooks + + CVE-2025-55131 src,lib: refactor unsafe buffer creation to remove zero-fill toggle + + CVE-2026-21637 tls: route callback exceptions through error handlers + + -- Jérémy Lal Wed, 14 Jan 2026 01:19:18 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-6) unstable; urgency=medium + + * Add parallel/test-http-keep-alive-empty-line as flaky + * Revert "Drop ada component" + + -- Jérémy Lal Mon, 08 Dec 2025 00:23:49 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-5) unstable; urgency=medium + + * Restore libnode127 Breaks/Replaces previous ones. + Was removed for "nodejs" but this is actually needed + for transitions to happen. + + -- Jérémy Lal Fri, 21 Nov 2025 07:48:37 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-4) unstable; urgency=medium + + * More flaky tests on riscv64 + + -- Jérémy Lal Wed, 19 Nov 2025 14:12:26 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-3) experimental; urgency=medium + + * patch: upstream commit riscv64. Closes: #1090073 + + -- Jérémy Lal Tue, 11 Nov 2025 13:19:34 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-2) experimental; urgency=medium + + * Do not use shared libada-url0, still in NEW + + -- Jérémy Lal Mon, 10 Nov 2025 00:39:43 +0100 + + nodejs (22.21.1+dfsg+~cs22.19.0-1) experimental; urgency=medium + + * New upstream version 22.21.1+dfsg+~cs22.19.0 + Closes: #11110524. + * B-D simdjson >= 3.13.0 + * B-D libada-url + * Remove install of amaro shim + * Skip expected failing tests + * patch: we build without-amaro for now, disable strip-types + * Improve passing of --dest-* options. (Closes: #1057298) + * Refresh patches + + -- Jérémy Lal Mon, 10 Nov 2025 00:39:32 +0100 + + nodejs (22.19.0+dfsg+~cs22.18.0-1) experimental; urgency=medium + + * New upstream version 22.19.0+dfsg+~cs22.18.0 + * Reduce default test timeout to 600 seconds. + * Reenable trying to load amaro and fail properly + + -- Jérémy Lal Fri, 29 Aug 2025 11:52:27 +0200 + + nodejs (22.18.0+dfsg+~cs22.17.2-2) experimental; urgency=medium + + * Fix flag syntax. ಠಠ + + -- Jérémy Lal Fri, 22 Aug 2025 19:51:04 +0200 + + nodejs (22.18.0+dfsg+~cs22.17.2-1) experimental; urgency=medium + + * New upstream version 22.18.0+dfsg+~cs22.17.2 + * Fix tools/test.py patch + * watch: component @types/node with checksum. Closes: #1111724. + * Disable amaro for now + + -- Jérémy Lal Fri, 22 Aug 2025 14:04:32 +0200 + + nodejs (22.18.0+dfsg-1) experimental; urgency=medium + + * New upstream version 22.18.0+dfsg + * Recommends: node-amaro (currently unavailable) + + patch: load it from /usr/share/nodejs/amaro/dist/index.js + * d/control: B-D libzstd-dev + * d/control: Bump libuv1 to 1.51.0 + * d/copyright: maintenance, and exclude deps/zstd + + -- Jérémy Lal Fri, 08 Aug 2025 10:44:50 +0200 + + nodejs (22.14.0+dfsg-1) experimental; urgency=medium + + * New upstream version 22.14.0+dfsg + * Patch: update tests to use system modules, not local deps + * Tests: skip tests using typescript support + + -- Jérémy Lal Fri, 14 Mar 2025 10:19:59 +0100 + + nodejs (22.12.0+dfsg-3) experimental; urgency=medium + + * Breaks/Replaces libnode115 with libnode127 + + -- Jérémy Lal Wed, 11 Dec 2024 23:53:24 +0100 + + nodejs (22.12.0+dfsg-2) experimental; urgency=medium + + * Fix uv patch + * libnode ABI bump from 115 to 127 + + -- Jérémy Lal Wed, 11 Dec 2024 14:19:26 +0100 + + nodejs (22.12.0+dfsg-1) experimental; urgency=medium + + * New upstream version 22.12.0+dfsg + * Switch gbp.conf, control, and watch to 22.x + * dfsg-exclude sqlite, use system library, b-d sqlite3-dev. + * dfsg-exclude amaro, build without it - it requires swc. + This disables the ability to execute TypeScript files + using the --experimental-strip-types flag. + * Less intrusive patch for test timeout multiplier + * Extend no-deps.patch to ignore missing simdjson.gyp + * Depends icu >= 73.1 + * Depends libuv1 >= 1.48, though 1.49 is needed. + Add interim patch to work around that. + * Depends node-undici >= 7.1.0 + + -- Jérémy Lal Tue, 10 Dec 2024 16:10:57 +0100 + + nodejs (20.19.5+dfsg+~cs20.19.12-4) unstable; urgency=medium + + * tests: mark more tests as flaky. Closes: #1117570. + + -- Jérémy Lal Wed, 08 Oct 2025 10:25:47 +0200 + + nodejs (20.19.5+dfsg+~cs20.19.12-3) unstable; urgency=medium + + * Fix evaluation of test exit code + + -- Jérémy Lal Mon, 06 Oct 2025 21:32:26 +0200 + + nodejs (20.19.5+dfsg+~cs20.19.12-2) unstable; urgency=medium + + * running tests, more fixes: + + NODE_TEST_DIR to tmp dir + + ensure out directory is at the right place + + -- Jérémy Lal Mon, 06 Oct 2025 20:14:58 +0200 + + nodejs (20.19.5+dfsg+~cs20.19.12-1) unstable; urgency=medium + + * New upstream version 20.19.5+dfsg+~cs20.19.12 + * Component @types/node in checksum. Closes: #1111724. + * Smaller tests timeout + * Exclude llhttp and use libllhttp-dev + * Remove deps/llhttp from copyright + * patch: upstream fix --shared-http-parser llhttp + * Remove b-d libhttp-parser-dev + * patch: revert edff105c34, makes inspector tests fail. + * rules: copy parts of the source in a safe (without ~) + directory name to run the tests. + + -- Jérémy Lal Sun, 05 Oct 2025 08:17:12 +0200 + + nodejs (20.19.4+dfsg-1) unstable; urgency=medium + + * New upstream version 20.19.4+dfsg. + Upstream supports HTTP QUERY and fix regression with llhttp. + Closes: #1106428. + + -- Jérémy Lal Wed, 20 Aug 2025 19:18:41 +0200 nodejs (20.19.2+dfsg-1) unstable; urgency=medium diff --cc debian/rules index 7dde5ec27,c9f6c5948..ec149e4e5 --- a/debian/rules +++ b/debian/rules @@@ -354,10 -395,22 +397,23 @@@ override_dh_auto_test-indep # called by dpkg-buildpackage and by autopkgtest override_dh_auto_test-arch: -ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),) +ifeq ($(filter nocheck,$(DEB_BUILD_PROFILES)),testsuitedisabled) - mkdir -p $(NODE_TEST_DIR) - $(MAKE) $(DEB_MAKE_CHECK_TARGET) - rm -rf $(NODE_TEST_DIR) + # all this to avoid a bug in nodejs tests when ~ is in the path + tmpDir=`mktemp -d --suffix=.nodejs`; \ + export NODE_TEST_DIR=$$tmpDir/tmp; \ + mkdir -p $$NODE_TEST_DIR; \ + for dir in test; \ + do cp -rf $(CURDIR)/$$dir $$tmpDir/$$dir; \ + done; \ + for dir in deps benchmark src lib doc tools tmp CHANGELOG.md Makefile out; \ + do ln -sf $(CURDIR)/$$dir $$tmpDir/$$dir; \ + done; \ + ln -sf $$tmpDir tmpdirtest; \ + cd $$tmpDir; \ + $(MAKE) $(DEB_MAKE_CHECK_TARGET); result=$$?; \ + rm -rf $$tmpDir tmpdirtest; \ + if [ $$result -ne 0 ]; then exit 1; fi ++>>>>>>> debpsuedomerge endif override_dh_auto_install-indep: