From: Raspbian automatic forward porter Date: Tue, 21 Jan 2020 16:10:32 +0000 (+0000) Subject: Merge version 14.2.6-1+rpi1 and 14.2.6-4 to produce 14.2.6-4+rpi1 X-Git-Tag: archive/raspbian/14.2.6-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff9b8bdbbf5d604310a571f2c5128376f42b87ef;p=ceph.git Merge version 14.2.6-1+rpi1 and 14.2.6-4 to produce 14.2.6-4+rpi1 --- ff9b8bdbbf5d604310a571f2c5128376f42b87ef diff --cc debian/changelog index 62ace8065,d55934544..2d9fb1d61 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,33 +1,46 @@@ - ceph (14.2.6-1+rpi1) bullseye-staging; urgency=medium ++ceph (14.2.6-4+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green 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. + - -- Peter Michael Green Thu, 16 Jan 2020 14:14:03 +0000 ++ -- Raspbian forward porter Tue, 21 Jan 2020 16:10:31 +0000 ++ + ceph (14.2.6-4) unstable; urgency=high + + * Really uploading to unstable now. + + -- Bernd Zeimetz Sat, 18 Jan 2020 19:58:32 +0100 + + ceph (14.2.6-3) experimental; urgency=high + + * Uploading to unstable, including changes to make ceph + build on mipsel again (Closes: #948722). + * [1bac6f0] mgr/dashboard: fix improper URL checking. + This change disables up-level references beyond the HTTP base directory. + [CVE-2020-1699] + Upstream commit 0443e40c11280ba3b7efcba61522afa70c4f8158 + Thanks to Salvatore Bonaccorso (Closes: #949206) + * [720ce76] Updating changelog (from experimental) + + -- Bernd Zeimetz Sat, 18 Jan 2020 19:11:22 +0100 + + ceph (14.2.6-2) experimental; urgency=medium + + * [fc4df2f] d/rules: make sure mips doesn't match on mipsel/mips64el + * [3d9ed86] Add patch to disable dencoder build if needed. + * [ce0c9bb] Don't build ceph-dencoder on mipsel. + Its a debugging tool and does not build on mipsel due to g++/clang++ + running out of memory. + Replacing it by a shellscript that prints an error message. + * [0d83e22] Configure gbp for experimental + + -- Bernd Zeimetz Thu, 16 Jan 2020 23:59:37 +0100 ceph (14.2.6-1) unstable; urgency=medium diff --cc debian/patches/series index f93450992,ab6ed29e7..8f0e191cf --- a/debian/patches/series +++ b/debian/patches/series @@@ -12,5 -12,5 +12,7 @@@ bluefs-use-uint64_t-for-len.patc fix-clang-build.patch debian-armel-armhf-buildflags.patch fix-bash-completion-location + add-option-to-disable-ceph-dencoder.patch + 0443e40c11280ba3b7efcba61522afa70c4f8158.patch +detect-raspbian.diff +remove-problematic-gitattributes-files.patch