Merge tag '17.0.12+7-1+rpi1' of 172.17.3.10:/build/git/o/openjdk-17 into HEAD

diff --cc debian/changelog
index 716b1c27ab181389bf2dd109ec994d7357564db9,1894ef3eb955bbbf85df0a6cefa723163d4df9a0..49f4042dcfe752898890074af813c8ae9529bf6a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,71 -1,50 +1,80 @@@
 -openjdk-17 (17.0.12+7-1+rpi1) trixie-staging; urgency=medium
++openjdk-21 (21.0.4+7-2+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>  Mon, 29 Jul 2024 13:16:58 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 15 Aug 2024 16:30:53 +0000
+ 
 -openjdk-17 (17.0.12+7-1) unstable; urgency=medium
 +openjdk-21 (21.0.4+7-2) unstable; urgency=medium
  
 -  * OpenJDK 17.0.12 release, build 7.
 +  [ Vladimir Petko ]
 +  * d/copyright: Regenerate copyright.
 +  * d/watch: Use fixed googletest version.
 +  * d/rules, d/t/*: Collate all excluded tests into d/problemlist.csv.
 +  * d/rules: Enable fallback linker for Foreign Function and Memory API
 +    on i386 and armhf.
 +  * d/p/jdk-8336529-proposed.patch: Fix time_t migration issue on armhf.
 +    openjdk is unable to set file last modified timestamp.
 +  * d/rules: Enable fallback linker for architectures that do not
 +    provide a native one.
 +  * d/rules, d/control.in: Depend on pkgconf rather than pkg-config in
 +    bookworm and later releases. This resolves lintian warning
 +    build-depends-on-obsolete-package Build-Depends: pkg-config => pkgconf.
 +  * d/rules: Drop autotools-dev dependency for the modern debhelper.
 +    This resolves obsolete autotools-dev dependency lintian warning.
 +    See #844191.
 +  * d/t/control.in: allow stderr for smoke tests.
 +
 + -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Jul 2024 08:37:36 +0200
 +
 +openjdk-21 (21.0.4+7-1) unstable; urgency=high
 +
 +  * OpenJDK 21.0.4 release, build 7.
 +    - CVEs:
 +      + CVE-2024-21147
 +      + CVE-2024-21145
 +      + CVE-2024-21140
 +      + CVE-2024-21131
 +      + CVE-2024-21138
 +    - Security Fixes:
 +      + JDK-8316138: Added GlobalSign R46 and E46 root CA certificates.
 +      + JDK-8326891: Native executables and libraries on Linux Use RPATH
 +        instead of RUNPATH.
 +      + JDK-8328638: Fallback option for POST-only OCSP requests.
 +
 + -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Jul 2024 09:31:36 +0200
 +
 +openjdk-21 (21.0.4~6ea-1) unstable; urgency=medium
 +
 +  * OpenJDK 21.0.4, build 6 (early access).
 +
 +  [ Matthias Klose ]
 +  * Build using GCC 10 for focal.
  
 - -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Jul 2024 13:02:09 +0200
 +  [ Vladimir Petko ]
 +  * Update patches for the snapshot build.
 +  * d/p/jdk-8331541.patch: Add fix for the link failure against libjvm.so
 +    on i386. Closes: #1070476.
  
 -openjdk-17 (17.0.12~6ea-1) unstable; urgency=medium
 + -- Matthias Klose <doko@ubuntu.com>  Sat, 29 Jun 2024 07:21:02 +0200
  
 -  * OpenJDK 17.0.12 early access, build 6.
 +openjdk-21 (21.0.3+9-2) unstable; urgency=medium
  
    [ Vladimir Petko ]
 +  * Re-enable running the tests during the build.
    * d/p/8295111.patch: Apply upstream patch to resolve jpackage failure
      to create a deb package.
 -  * d/t/problems-i386.txt: Update i386 test exclusions.
 -  * d/t/problems-armhf.txt: Update armhf test exclusions.
 -  * d/p/jdk-8307977.patch: Rename patch.
 -  * d/p/jdk-8334502-proposed.patch: Add proposed fix for iso8601 time format
 -    on ARM32.
 -  * d/p/jdk-8334895-proposed.patch: Add proposed fix for configuration failure
 -    when CDS is disabled on arm64.
 -  * d/control: Regenerate control.
 -  * d/rules: Enable early access release.
 -  * d/rules: Enable jtreg tests.
 -  * d/rules: Include /usr/share/dpkg/buildflags.mk to avoid configure failure
 -    due to the undefined variables.
 -  * d/p/jdk-8325567.patch: jspawnhelper without args fails with segfault.
 -    LP: #2055280.
 -  * d/p/jdk-8331541.patch: Add fix for the link failure against libjvm.so on
 -    i386. Closes: #1057715.
 -
 -  [ Matthias Klose ]
 -  * Build using GCC 10 for focal.
 +  * Add autopkgtest to test that JNI applications using the invocation API
 +    can be linked.
 +  * Add autopkgtest for libpcsclite initialisation.
  
 - -- Matthias Klose <doko@ubuntu.com>  Sat, 29 Jun 2024 09:05:11 +0200
 + -- Matthias Klose <doko@ubuntu.com>  Wed, 24 Apr 2024 15:34:38 +0200
  
 -openjdk-17 (17.0.11+9-1) unstable; urgency=high
 +openjdk-21 (21.0.3+9-1) unstable; urgency=high
  
 -  * OpenJDK 17.0.11 release, build 9.
 +  * OpenJDK 21.0.3 release, build 9.
      - CVE-2024-21011, 8319851: Improve exception logging.
      - CVE-2024-21068, 8322122: Enhance generation of addresses.
      - 8318340: Improve RSA key implementations.

diff --cc debian/patches/series
index f4ec90642d3380102a4fb0cd49869205605dd963,1a7a360bd1c540b77dcb415a4a1b96f80c8097ab..f766c42ab6949f31f0973d8f8432cb321a4ebe70
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -33,17 -36,11 +33,18 @@@ log-generated-classes-test.patc
  update-permission-test.patch
  ldap-timeout-test-use-ip.patch
  test-use-ip-address.patch
 -loong64-autoconf-config.diff
 -googletest-version.diff
 +arch-add-ports.diff
 +compile-preview.diff
  jdk-8307977-proposed.patch
 -jdk-8295111.patch
 +jdk-8242564.patch
 +warn-fontmanager.patch
 +jdk-8318418.patch
 +jdk-8295795.patch
 +hsdis-fpic.patch
 +jdk-8329983.patch
  jdk-8334502-proposed.patch
  jdk-8334895-proposed.patch
 -jdk-8325567.patch
 +jdk-8331541.patch
 +jdk-8336529-proposed.patch
 +jdk-8312488.patch
+ client_default.diff

diff --cc debian/rules
Simple merge

diff --cc make/modules/java.base/Copy.gmk
Simple merge