Merge version 14.2.21-1+rpi1+deb11u2 and 14.2.21-1+deb11u3 to produce 14.2.21-1+rpi1...

diff --cc debian/changelog
index 15998ddb2d3507449602b642237746de267b85d6,ac08e12f9bc7c3ca63ad58f247ac93d4238b83a5..361922d1d81b3b60dc82db1700e4885aa4a286d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- ceph (14.2.21-1+rpi1+deb11u2) bullseye-staging; urgency=medium
++ceph (14.2.21-1+rpi1+deb11u3) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Jul 2017 09:48:17 +0000]
 +  * Add Raspbian to lists of "debian-like" distros.
 +    + Hopefully this will fix site-packages vs dist-packages
 +      build failure in Raspbian.
 + 
 +  [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green]
 +  * Remove problematic gitattributes files.
 +  * Disable neon on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Feb 2026 02:28:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 May 2026 15:23:21 +0000
++
+ ceph (14.2.21-1+deb11u3) bullseye-security; urgency=high
+ 
+   * Non-maintainer upload by the Debian LTS team.
+   * CVE-2024-31884: Fix an issue where the Python bindings did not correctly
+     implement SSL certificate checking. (Closes: #1126573)
+ 
+  -- Chris Lamb <lamby@debian.org>  Fri, 06 Feb 2026 11:24:31 -0800
  
  ceph (14.2.21-1+deb11u2) bullseye-security; urgency=high
  

diff --cc debian/patches/series
index 337cbcc0894469d9951fd37460b3bcc1d27ad779,3c95235d81cea8fb7dfde3d9418aa3568f3b56c4..d4e9c035143b6a67d5b3adfdd4300e1aef37dfb8
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -25,5 -25,4 +25,6 @@@ CVE-2025-52555-1.patc
  CVE-2025-52555-2.patch
  CVE-2022-0670.patch
  CVE-2024-47866.patch
+ CVE-2024-31884.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch