Manual merge of version 14.2.9-1+rpi1 and 14.2.15-3 to produce 14.2.15-3+rpi1, see...

diff --cc debian/changelog
index f858d3facf8c21870e1ec94b4a17b313d1df33d8,64673749be116d70181e01943762a39909a6d865..0970e8f2232dcc43c02db9a21b968949f72f0486
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,52 +1,65 @@@
- ceph (14.2.9-1+rpi1) bullseye-staging; urgency=medium
++ceph (14.2.15-3+rpi1) 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>  Fri, 01 May 2020 03:16:43 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 10 Dec 2020 19:21:33 +0000
++
+ ceph (14.2.15-3) unstable; urgency=medium
+ 
+   [ Adrian Bunk ]
+   * [197afaf] Merge branch 'debian/unstable' into 'debian/unstable'
+     Portability fixes
+     See merge request ceph-team/ceph!6
+ 
+  -- Thomas Goirand <zigo@debian.org>  Thu, 03 Dec 2020 21:03:06 +0100
+ 
+ ceph (14.2.15-2) unstable; urgency=medium
+ 
+   * Do not build with clang, instead, set --max-parallel=1, as it seems it
+     worked for Ubuntu. If this doesn't work, we'll disable the non-64 bits
+     arch completely.
+ 
+  -- Thomas Goirand <zigo@debian.org>  Mon, 30 Nov 2020 21:10:12 +0100
+ 
+ ceph (14.2.15-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #956750):
+     - Fix FTBFS with GCC-10 (Closes: #957079).
+     - Fix CVE-2020-10753 (Closes: #963760).
+     - Fix CVE-2020-25660 (Closes: #975275).
+   * Refreshed patches:
+     - 32bit-avoid-size_t.patch
+     - add-option-to-disable-ceph-dencoder.patch
+     - bluefs-use-uint64_t-for-len.patch
+     - disable-crypto.patch
+     - mds-purgequeue-use_uint64_t.patch
+   * Raw wrap-and-sort -bastk.
+   * Added myself as uploader.
+   * Added librdkafka-dev as build-depends.
+   * Fixed debian/libcephfs-dev.install.
+   * debian/calc-max-parallel.sh: allow for more values of --max-parallel so
+     that ceph builds faster on more powerful machines.
+   * Add a patch to make Ceph aware of Python 3.9:
+     - make-ceph-python-3.9-aware.patch
+   * Add a debian/source/options to ignore CRLF to CR changes.
+   * Use --home in ceph-common.postinst when creating the Ceph system user.
+   * Updated debian/libcephfs2.symbols (added 3 new symbols).
+   * Package: ceph-resource-agents, switch Priority: to optional.
+   * Add debian/source.lintian-overrides to allow .js which shipped by upstream
+     in both compiled and source version.
+   * Removed now useless dpkg-maintscript-helper rm_conffile: they have been
+     around for more than one release.
+   * debian/ceph-osd.postinst: remove as it's doing nothing.
+   * Fix debian/lib{rbd1,rados2}.symbols (3 missing symbols).
+ 
+  -- Thomas Goirand <zigo@debian.org>  Fri, 27 Nov 2020 23:58:00 +0100
  
  ceph (14.2.9-1) unstable; urgency=high
  

diff --cc debian/patches/series
index 3830c9ac8aefdf4a14803d7afb30c8173390e91c,0c69d0cdce9fec3228ee6c165b84911f15d379b8..5aa4bd494fcfb454408c05242da7f2df6fcd9d19
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -14,5 -14,4 +14,6 @@@ fix-bash-completion-locatio
  add-option-to-disable-ceph-dencoder.patch
  riscv64-link-pthread.patch
  mds-purgequeue-use_uint64_t.patch
+ make-ceph-python-3.9-aware.patch
 +detect-raspbian.diff
 +remove-problematic-gitattributes-files.patch

diff --cc debian/rules
index 2e8740475528cc06441054b5f4d048861a00dfc1,c712fd5d118632731c61ccede47ca1a9286e64bd..d320871fb52395b1a8483611be0dfc4d37d1d12f
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -32,12 -25,9 +25,12 @@@ endi
  ifeq ($(DEB_HOST_ARCH),armel)
      extraopts += -DHAVE_ARM_NEON=0
  endif
 +ifeq ($(DEB_HOST_ARCH),armhf)
 +    extraopts += -DHAVE_ARM_NEON=0
 +endif
  
- # disable ceph-dencoder on mipsel to avoid clang oom
- ifneq (,$(filter $(DEB_HOST_ARCH),mipsel))
+ # disable ceph-dencoder on 32bit except i386 to avoid g++ oom
+ ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hppa m68k mips mipsel powerpc sh4 x32))
      extraopts += -DDISABLE_DENCODER=1
  endif
  

diff --cc install-deps.sh
Simple merge

diff --cc qa/workunits/ceph-helpers-root.sh
Simple merge

diff --cc qa/workunits/rados/test_envlibrados_for_rocksdb.sh
index 5ee64dbd9109e6a2ba7580d368ad08615c158d21,7099dafb3fc114712695182fcf7e0179ae1e6b53..64b9540f41af665ec918ad79523c6943ece52e6b
--- 1/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
--- 2/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
@@@ -19,16 -19,8 +19,8 @@@ CURRENT_PATH=`pwd
  # install prerequisites
  # for rocksdb
  case $(distro_id) in
 -      ubuntu|debian|devuan)
 +      ubuntu|debian|devuan|raspbian)
-               install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev
-         case $(distro_version) in
-             *Xenial*)
-                 install_cmake3_on_xenial
-                 ;;
-             *)
-                 install cmake
-                 ;;
-         esac
+               install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev cmake
                ;;
        centos|fedora|rhel)
                install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64