Merge version 8.2.18-1+rpi1 and 8.2.21-1 to produce 8.2.21-1+rpi1

diff --cc debian/changelog
index a6698472c3a0c5fed1afca6b9eb786d9ef320a18,5592b4594f068b671c14f57b13e77a18bbdb35ea..e42ad1c0ce3066dcca25e5521342a22602eb68c9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,52 @@@
- php8.2 (8.2.18-1+rpi1) trixie-staging; urgency=medium
++php8.2 (8.2.21-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 8.2.7-1~deb12u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Jul 2023 18:02:54 +0000]
 +  * Fix fpu setting for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Jun 2024 20:58:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 15 Jul 2024 23:22:06 +0000
++
+ php8.2 (8.2.21-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.21
+   * Add Restart=on-failure to the systemd service file
+   * Remove the patch that fixed GH-14480 (merged upstream)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 04 Jul 2024 17:15:46 +0200
+ 
+ php8.2 (8.2.20-3) unstable; urgency=medium
+ 
+   * Add Breaks on extensions using php_strlcpy (Closes: #1074167)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Mon, 24 Jun 2024 13:16:58 +0200
+ 
+ php8.2 (8.2.20-2) unstable; urgency=medium
+ 
+   * Fix GH-14480: Method visibility issue introduced in version 8.3.8 (#14484)
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 08 Jun 2024 23:18:10 +0200
+ 
+ php8.2 (8.2.20-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.20
+    + [CVE-2024-4577]: Bypass of CVE-2012-1823, Argument Injection in
+      PHP-CGI.
+    + [CVE-2024-5458]: Filter bypass in filter_var FILTER_VALIDATE_URL.
+    + [CVE-2024-5585]: Bypass of CVE-2024-1874.
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 06 Jun 2024 17:25:11 +0200
+ 
+ php8.2 (8.2.19-2) unstable; urgency=medium
+ 
+   * Fix the php-config mangling script in configure embeds the options in
+     a single quote
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 23 May 2024 12:29:27 +0200
+ 
+ php8.2 (8.2.19-1) unstable; urgency=medium
+ 
+   * New upstream version 8.2.19
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Mon, 13 May 2024 20:12:23 +0200
  
  php8.2 (8.2.18-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge