Merge version 17.0.4+8-1+rpi1 and 17.0.6+10-1 to produce 17.0.6+10-1+rpi1

diff --cc debian/changelog
index 26736d46aa576802a2b0273f1d21b97cb0370e19,b9c499782f156e8a8a41d0e8700dc96269c38e9a..b2b119c129edf3ee7dbe051cb8dbde7a18f63a82
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,42 +1,51 @@@
- openjdk-17 (17.0.4+8-1+rpi1) bookworm-staging; urgency=medium
++openjdk-17 (17.0.6+10-1+rpi1) bookworm-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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 11 Nov 2022 07:39:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 23:05:26 +0000
++
+ openjdk-17 (17.0.6+10-1) unstable; urgency=high
+ 
+   * OpenJDK 17.0.6 release, build 10.
+     - CVE-2023-21835, CVE-2023-21843
+     - Release notes:
+       https://www.oracle.com/java/technologies/javase/17-0-6-relnotes.html
+ 
+   [ Vladimir Petko ]
+   * debian/patches/*: Refresh patches for the new release and drop unused
+     patches.
+   * debian/rules: add lunar to jtreg version selection.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Thu, 26 Jan 2023 11:36:16 +0100
+ 
+ openjdk-17 (17.0.5+8-2) unstable; urgency=medium
+ 
+   * Fix the binary-indep only build.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 19 Oct 2022 16:23:50 +0200
+ 
+ openjdk-17 (17.0.5+8-1) unstable; urgency=high
+ 
+   * OpenJDK 17.0.5+8 (release).
+   * Security fixes
+     - JDK-8289366: Improve HTTP/2 client usage.
+     - JDK-8288508: Enhance ECDSA usage.
+     - JDK-8286918: Better HttpServer service.
+     - JDK-8287446: Enhance icon presentations.
+     - JDK-8286910: Improve JNDI lookups.
+     - JDK-8286511: Improve macro allocation.
+     - JDK-8286526: Improve NTLM support.
+     - JDK-8286533: Key X509 usages.
+     - JDK-8286077: Wider MultiByte conversions.
+     - JDK-8286519: Better memory handling.
+     - JDK-8285662: Better permission resolution.
+     - JDK-8282252: Improve BigInteger/Decimal validation.
+   * Build using GCC 12 in recent development distros.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Wed, 19 Oct 2022 06:59:58 +0200
  
  openjdk-17 (17.0.4+8-1) unstable; urgency=high
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge