Merge version 18.10.0+dfsg-6+rpi1 and 18.12.1+dfsg-2 to produce 18.12.1+dfsg-2+rpi1

diff --cc debian/changelog
index a244154c74e39c8cd7c6a9cd153a68a013d192b3,be25e51347f3325873f1c38baa4be3faeb052fa5..6671043d5d8a9fe7c271a6308e19699d823706e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,58 +1,67 @@@
- nodejs (18.10.0+dfsg-6+rpi1) bookworm-staging; urgency=medium
++nodejs (18.12.1+dfsg-2+rpi1) bookworm-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Nov 2022 03:51:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 20 Nov 2022 10:20:13 +0000
++
+ nodejs (18.12.1+dfsg-2) unstable; urgency=medium
+ 
+   * Patch: fix test suite for icu 72.1
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 09 Nov 2022 18:16:06 +0100
+ 
+ nodejs (18.12.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 18.12.1+dfsg
+   * Fixes CVE-2022-43548: DNS rebinding in --inspect via invalid
+     octal IP address (Medium).
+     Closes: #1023518.
+   * Build using gcc-11, g++-11, fixes mips64el and riscv64 builds,
+     https://github.com/nodejs/node/issues/44126
+   * Patch: fix link to home in html doc. Closes: #1018153
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sun, 06 Nov 2022 00:14:11 +0100
+ 
+ nodejs (18.12.0+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version 18.12.0+dfsg
+   * Add flaky new debugger test
+   * watch nodejs 18 LTS
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Thu, 27 Oct 2022 15:02:24 +0200
+ 
+ nodejs (18.11.0+dfsg-4) experimental; urgency=medium
+ 
+   * Patch: fix mipsel build failure
+   * Patch: drop mips/no_jitless, fixed upstream
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 26 Oct 2022 01:23:22 +0200
+ 
+ nodejs (18.11.0+dfsg-3) experimental; urgency=medium
+ 
+   * Revert "Build using gcc-11, g++-11"
+   * Skip buggy watch mode tests
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Mon, 17 Oct 2022 14:04:02 +0200
+ 
+ nodejs (18.11.0+dfsg-2) experimental; urgency=medium
+ 
+   * Do not use --shared-ngctp2/http3 switch
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Fri, 14 Oct 2022 16:23:40 +0200
+ 
+ nodejs (18.11.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream version 18.11.0+dfsg
+   * armhf: minimal target is vfpv3-d16 (Closes: #1021546).
+   * copyright: update for a new file
+   * Drop nghttp3, ngtcp2 deps: useless without openssl-quic
+   * Refresh patches
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Fri, 14 Oct 2022 15:30:25 +0200
  
  nodejs (18.10.0+dfsg-6) unstable; urgency=medium
  

diff --cc debian/rules
index 3565201386646eced85c5b31b80818cde7da4432,1c18c035f52660099135df3a20564663d65486ec..d8057d9283039eac89fd59b51f9c7950fba8799b
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -142,12 -140,10 +140,12 @@@ ifeq (armhf, $(DEB_HOST_ARCH)
  DEB_CONFIGURE_EXTRA_FLAGS += --with-arm-float-abi=hard
  ifeq ($(shell dpkg-vendor --derives-from raspbian && echo true),true)
  # enable vfp, disable armv7
 -DEB_CONFIGURE_EXTRA_FLAGS += --with-arm-fpu=vfp
 +DEB_CONFIGURE_EXTRA_FLAGS += --with-arm-fpu=vfp --with-arm-version=6
 +CFLAGS += -march=armv6k -mfpu=vfpv2
 +CPPFLAGS += -march=armv6k -mfpu=vfpv2
  else
- # enable armv7 vfpv3
- DEB_CONFIGURE_EXTRA_FLAGS += --with-arm-fpu=vfpv3
+ # enable armv7 vfpv3-d16
+ DEB_CONFIGURE_EXTRA_FLAGS += --with-arm-fpu=vfpv3-d16
  endif
  endif