Merge version 16.2.11+ds-2+rpi1 and 16.2.15+ds-0+deb12u1 to produce 16.2.15+ds-0...

diff --cc debian/changelog
index 3d9f2307cda733c58aef4ef11859f54efd61bb4f,adc3956a54e590bdd83a14591759f53c539cbd6a..80412a2cae9b8d04acb7e3632acc1c77c70189a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,17 +1,30 @@@
- ceph (16.2.11+ds-2+rpi1) bookworm-staging; urgency=medium
++ceph (16.2.15+ds-0+deb12u1+rpi1) bookworm-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>  Sun, 26 Feb 2023 17:58:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Dec 2024 22:34:51 +0000
++
+ ceph (16.2.15+ds-0+deb12u1) bookworm-security; urgency=medium
+ 
+   * Adding myself to uploaders.
+   * Updating watch file for ceph 16.
+   * Merging upstream version 16.2.15:
+     - 16.2.12: Fix rgw bucket validation against POST policies
+       [CVE-2023-43040]
+   * Refreshing 32bit-fixes.patch.
+   * Removing bug1917414.patch, included upstream.
+   * Removing patches for CVE-2022-3650, included upstream.
+   * Cherry-picking patch from upstream to fix authentication bypass in rgw
+     (Closes: #1088993) [CVE-2024-48916].
+ 
+  -- Daniel Baumann <daniel@debian.org>  Wed, 04 Dec 2024 06:46:17 +0100
  
  ceph (16.2.11+ds-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 0715d06eaa7bf80bee2589450b00f02bdb976005,f762cacfb8405d11a3aa61060dcdfb5f7ae866f6..87edd69c2af28e0eb8a8aae46b8f580dcafccb25
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -20,8 -19,5 +19,7 @@@ cmake-test-for-16-bytes-atomic-support-
  only-yied-under-armv7-and-above.patch
  Fix-build-with-fmt-8-9.patch
  fix-CheckCxxAtomic-riscv64.patch
- CVE-2022-3650_1_ceph-crash_drop_privleges_to_run_as_ceph_user_rather_than_root.patch
- CVE-2022-3650_2_ceph-crash_fix_stderr_handling.patch
  CVE-2022-3854_1_rgw_Guard_against_malformed_bucket_URLs.patch
+ CVE-2024-48916.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch

diff --cc install-deps.sh
index 269a312af77100fa8c889041f61df125a53d894c,7e137d687f105ca802af874e2b2ceda45951a067..80fdfa86a4547ee137e185c88f55b9fb1ff9b537
--- 1/install-deps.sh
--- 2/install-deps.sh
+++ b/install-deps.sh
@@@ -308,8 -340,11 +340,11 @@@ els
      [ $WITH_ZBD ] && with_zbd=true || with_zbd=false
      source /etc/os-release
      case "$ID" in
 -    debian|ubuntu|devuan|elementary)
 +    debian|ubuntu|devuan|raspbian|elementary)
          echo "Using apt-get to install dependencies"
+       # Put this before any other invocation of apt so it can clean
+       # up in a broken case.
+         clean_boost_on_ubuntu
          $SUDO apt-get install -y devscripts equivs
          $SUDO apt-get install -y dpkg-dev
          ensure_python3_sphinx_on_ubuntu