Merge version 20.18.1+dfsg-2+rpi1 and 20.18.3+dfsg-1 to produce 20.18.3+dfsg-1+rpi1

diff --cc debian/changelog
index bbd24971cbd60ff8c1b781f42a6ee2054bb9f583,3b426d537c8480ef0bb53ea8a40dbccb7363f144..f7111947501a4a1483e22a953ac741ed9be8a469
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,37 +1,46 @@@
- nodejs (20.18.1+dfsg-2+rpi1) trixie-staging; urgency=medium
++nodejs (20.18.3+dfsg-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 18.10.0+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <root@raspbian.org>  Sun, 12 Jan 2025 09:39:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Mar 2025 06:29:46 +0000
++
+ nodejs (20.18.3+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 20.18.3+dfsg
+   * Really SKIP test-watch-mode - can hang
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Mon, 10 Feb 2025 15:45:36 +0100
+ 
+ nodejs (20.18.2+dfsg-4) unstable; urgency=medium
+ 
+   * Fix tests invocation
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sun, 02 Feb 2025 01:03:59 +0100
+ 
+ nodejs (20.18.2+dfsg-3) unstable; urgency=medium
+ 
+   * Mark skipped cli tests as flaky instead.
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sat, 01 Feb 2025 21:54:45 +0100
+ 
+ nodejs (20.18.2+dfsg-2) unstable; urgency=medium
+ 
+   * Move common flakyTests to debian/rules
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sat, 01 Feb 2025 14:59:38 +0100
+ 
+ nodejs (20.18.2+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 20.18.2+dfsg
+     + CVE-2025-23083: Worker permission bypass via InternalWorker
+       leak in diagnostics (High).
+     + CVE-2025-23085: GOAWAY HTTP/2 frames cause memory leak outside heap
+       (Medium).
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sun, 26 Jan 2025 16:31:48 +0100
  
  nodejs (20.18.1+dfsg-2) unstable; urgency=medium
  

diff --cc debian/rules
index 89ec2871116af63ed8d503538b58b29fe6431d58,aeb8164ac6f95d2a334f1adc17199586f947edb9..02c4c004074e637c6ac27e79ad76cdb2ea18795e
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -271,8 -296,9 +298,9 @@@ override_dh_auto_build-indep
  override_dh_auto_test-indep:
        # skip tests
  
+ # 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)