Merge version 17.0.10+7-1+rpi1 and 17.0.11+9-1 to produce 17.0.11+9-1+rpi1

diff --cc debian/changelog
index 69789dbd24c28af6c5dccba5835b584614882ada,f9a20dfd32b1ed10039f283fa3dd17be1350c845..df1640b6a65a93c0d26fa2536944f8f9ca49ee40
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,51 +1,60 @@@
- openjdk-17 (17.0.10+7-1+rpi1) trixie-staging; urgency=medium
++openjdk-17 (17.0.11+9-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>  Fri, 09 Feb 2024 19:36:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 02 Jun 2024 12:43:01 +0000
++
+ openjdk-17 (17.0.11+9-1) unstable; urgency=high
+ 
+   * OpenJDK 17.0.11 release, build 9.
+     - CVE-2024-21011, 8319851: Improve exception logging.
+     - CVE-2024-21068, 8322122: Enhance generation of addresses.
+     - 8318340: Improve RSA key implementations.
+     - CVE-2024-21012, 8315708: Enhance HTTP/2 client usage.
+   * CVE-2024-21094, 8317507: Already fixed in November 2023:
+     C2 compilation fails with "Exceeded _node_regs array".
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 17 Apr 2024 14:24:58 +0200
+ 
+ openjdk-17 (17.0.11~7ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.11 early access, build 7.
+ 
+   [ Matthias Klose ]
+   * Don't try to install jhsdb on armhf with a zero-only build.
+   * Update cups dependencies for time_t64.
+ 
+   [ Pushkar Kulkarni ]
+   * Fix a typo in the vendor name derivation logic.
+   * copyright-generator: Derive release from debian/rules.
+ 
+   [ Vladimir Petko ]
+   * Fix installing the s390x build.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Thu, 21 Mar 2024 00:04:45 +0100
+ 
+ openjdk-17 (17.0.11~6ea-1) unstable; urgency=medium
+ 
+   * OpenJDK 17.0.11 early access, build 6.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Tue, 12 Mar 2024 18:37:33 +0100
+ 
+ openjdk-17 (17.0.10+7-3) unstable; urgency=medium
+ 
+   * d/changelog: Whitespace cleanup.
+   * Update build dependency on libfontconfig-dev.
+   * Apply proposed patch for JDK-8307977. Addresses: #1034600.
+   * libcups2, libfontconfig1: Make it a recommends in jre-headless,
+     a dependency in jre.
+   * Make the dependencies for libfontmanager.so and libjsound.so
+     recommendations in jre-headless, and dependencies in jre.
+   * Drop build dependencies on libgtk2 | libgtk3.
+   * Disable running the tests for the time_t64 bootstrap.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Mon, 11 Mar 2024 16:08:33 +0100
  
  openjdk-17 (17.0.10+7-1) unstable; urgency=high
  

diff --cc debian/patches/series
index ecaab525e3efd92f8ba1d1f288ad5c035a31e4a5,f9bd6209517ac18447c7d056c48e5d2a7743e15e..f86630df1636af1a0d58b867a3dc793b0bdbcaf4
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -38,4 -38,4 +38,5 @@@ ldap-timeout-test-use-ip.patc
  test-use-ip-address.patch
  loong64-autoconf-config.diff
  googletest-version.diff
+ 8307977-proposed.diff
 +client_default.diff

diff --cc debian/rules
Simple merge