Merge version 21.0.5~8ea-1+rpi1 and 21.0.6+7-1 to produce 21.0.6+7-1+rpi1

diff --cc debian/changelog
index 07c76b26b9cca9fa094572790a84ec1cc436256a,4193216c02426bf0b98fbe0ecdee221109cc3cbb..b00cdcde316db77ba35b199a892b0aec39335fbf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,48 +1,57 @@@
- openjdk-21 (21.0.5~8ea-1+rpi1) trixie-staging; urgency=medium
++openjdk-21 (21.0.6+7-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes taken from 17.0.4+8-1~deb11u1+rpt1 by Serge Schneider]
 +  * Build with client jvm variant
 +    - https://github.com/raspberrypi/linux/issues/3306#issuecomment-1030781000
 +  * Default to client jvm on armhf
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Sep 2024 03:56:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Feb 2025 07:59:10 +0000
++
+ openjdk-21 (21.0.6+7-1) unstable; urgency=high
+ 
+   * OpenJDK 21.0.6 release, build 7. Release notes:
+     https://mail.openjdk.org/pipermail/jdk-updates-dev/2025-January/040828.html
+     - CVEs:
+       +  CVE-2025-21502 - 8330045: Enhance array handling.
+ 
+   [ Vladimir Petko ]
+   * d/rules: disable c2 compiler for boot jdk on s390x to avoid ftbfs.
+   * d/p/jdk-8347014-proposed.patch: Define MAP_FIXED_NOREPLACE_value for alpha.
+   * d/rules: Add -fno-delete-null-pointer-checks for armhf and armel.
+     The flag was removed in JDK-8316893 causing JVM lockup.
+   * d/rules: Dump complete hs_err_pid and replay_pid logs to stdout.
+   * d/rules: create link to jquery-3.7.1.min.js instead of jquery-3.6.1.min.js.
+     Also link jquery-ui.min.{js,css} (LP: #2095455).
+   * d/{watch,copyright}: regenerate.
+ 
+   [ Matthias Klose ]
+   * Try to work-around a ftbfs on alpha. For now we keep the
+     zero-alpha-workaround patch enabled instead of jdk-8347014-proposed.
+   * d/rules: Also dump logs for zero builds and for build failures.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 22 Jan 2025 08:58:11 +0100
+ 
+ openjdk-21 (21.0.6~6ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 21.0.6 early access, build 6.
+   * Really configure with --enable-dtrace on !s390x.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Fri, 20 Dec 2024 09:54:05 +0100
+ 
+ openjdk-21 (21.0.5+11-1) unstable; urgency=high
+ 
+   * OpenJDK 21.0.5 release, build 8.
+     - CVE-2024-21208
+     - CVE-2024-21210
+     - CVE-2024-21217
+     - CVE-2024-21235
+ 
+   [ Vladimir Petko ]
+   * d/rules: do not include dtrace support for S390x (JDK-8305174).
+   * d/t/problems.csv: Disable jdk/sun/security/util/Debug/DebugOptions.java
+     due to JDK-8339713.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 16 Oct 2024 10:41:47 +0200
  
  openjdk-21 (21.0.5~8ea-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 79eef8fb92df0257d7ab8b99325ca3cc418170e0,ecc40bf1028ae1487137d369ee5336e3ac9bb602..8475be64f46bcc6a435c96de2c4c425c55c02246
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -46,4 -46,6 +46,7 @@@ jdk-8334895-proposed.patc
  jdk-8331541.patch
  jdk-8336529-proposed.patch
  jdk-8312488.patch
+ # FIXME: which one of these two?
+ zero-alpha-workaround.diff
+ #jdk-8347014-proposed.patch
 +client_default.diff

diff --cc debian/rules
Simple merge