Merge version 8.4.21-1+rpi1 and 8.4.22-1 to produce 8.4.22-1+rpi1

diff --cc debian/changelog
index 76fe53c6cffaf8487131ef5a069b3b1bc0d48ee0,4904f911ce02cf11f8e903279dea35cfe5294395..08eb3ca5322f9adf1570f7087a192be90d97540c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,37 +1,44 @@@
- php8.4 (8.4.21-1+rpi1) forky-staging; urgency=medium
++php8.4 (8.4.22-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 8.4.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 17 Oct 2025 01:23:38 +0000]
 +  * Fix fpu setting for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 25 May 2026 03:40:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 21 Jun 2026 16:51:47 +0000
++
+ php8.4 (8.4.22-1) unstable; urgency=medium
+ 
+   * Update the php-fpm-reopenlogs script to not depend on PID file
+   * New upstream version 8.4.22
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Sat, 06 Jun 2026 07:58:41 +0200
+ 
+ php8.4 (8.4.21-3) unstable; urgency=medium
+ 
+   * Remove PrivateTmp=true from php-fpm.service unit
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Thu, 14 May 2026 16:50:06 +0200
+ 
+ php8.4 (8.4.21-2) unstable; urgency=medium
+ 
+   [ Ondřej Surý ]
+   * Add closes to the changelog entry
+   * Switch litespeed unit type to 'simple'
+   * Merge hardening from sapi/fpm/php-fpm.service.in into debian/php-fpm.service
+   * Add d/NEWS about the systemd unit file hardening
+ 
+   [ Renan Rodrigo ]
+   * Check dpkg-vendor to set the PHP_BUILD_PROVIDER value
+ 
+   [ MichaIng ]
+   * Do not create obsolete PID file
+ 
+   [ Theral Mackey ]
+   * Dont serve php as plaintext, if we turn off php engine
+ 
+   [ Christian Göttsche ]
+   * Update compiler flags
+ 
+  -- Ondřej Surý <ondrej@debian.org>  Wed, 13 May 2026 12:59:56 +0200
  
  php8.4 (8.4.21-1) unstable; urgency=medium
  

diff --cc debian/rules
index e0400d5c24bf4de7aceabb5e72ed59acde4d1496,f115705419997264090d77710d25e84919ef940d..ccc1a44c015c6ad1eb92a51eb0174f717b1b2974
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -158,15 -161,16 +161,16 @@@ ifeq (alpha-linux-gnu,$(DEB_HOST_GNU_TY
  endif
  
  ifeq (arm-linux-gnueabihf,$(DEB_HOST_GNU_TYPE))
 -  DEB_CFLAGS_MAINT_APPEND += -mfpu=vfpv3-d16
 +  DEB_CFLAGS_MAINT_APPEND += -mfpu=vfpv2
  endif
  
- # Enable producing of debugging information
- DEB_CFLAGS_MAINT_APPEND += -g
- 
  DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
  
+ DEB_CPPFLAGS_MAINT_APPEND += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ 
+ export DEB_CPPFLAGS_MAINT_APPEND
  export DEB_CFLAGS_MAINT_APPEND
+ export DEB_CXXFLAGS_MAINT_APPEND
  export DEB_LDFLAGS_MAINT_APPEND
  
  # some other helpful (for readability at least) shorthand variables