From: Raspbian automatic forward porter Date: Sun, 9 Feb 2020 06:18:46 +0000 (+0000) Subject: Merge version 14.2.6-5+rpi1 and 14.2.7-1 to produce 14.2.7-1+rpi1 X-Git-Tag: archive/raspbian/14.2.7-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e0eb00e47e24e00b2adea3d6879f873c80df75c;p=ceph.git Merge version 14.2.6-5+rpi1 and 14.2.7-1 to produce 14.2.7-1+rpi1 --- 1e0eb00e47e24e00b2adea3d6879f873c80df75c diff --cc debian/changelog index e5d4d3beb,4cdec5d2a..913d0a7e2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,31 +1,44 @@@ - ceph (14.2.6-5+rpi1) bullseye-staging; urgency=medium ++ceph (14.2.7-1+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, 30 Jan 2020 19:46:20 +0000 ++ -- Raspbian forward porter Sun, 09 Feb 2020 06:18:45 +0000 ++ + ceph (14.2.7-1) unstable; urgency=medium + + * [a68d12f] Update upstream source from tag 'upstream/14.2.7' + Update to upstream version '14.2.7' + with Debian dir 1125b03b88e8da85cf70f7cc540c1c30fa95d456 + This also contains a fix for + [CVE-2020-1700]: Fixed a flaw in RGW beast frontend that + could lead to denial of service from an unauthenticated client. + CVE-2020-1699 was patched since 14.2.6-3. + * [1474595] Removing patches applied upstream + + -- Bernd Zeimetz Sat, 01 Feb 2020 00:47:27 +0100 + + ceph (14.2.6-6) unstable; urgency=medium + + * [c18d632] Remove broken patch (Option::TYPE_SIZE as uint64_t). + This patch actually results in a segfault while parsing options. + Revert it and then see what it was actually needed for on 32bit. + Thanks to Martin Mlynář (Closes: #949743) + * [b5c7be8] Update patch with a non-segfaulting version. + Took me some time to figure out that in option.cc size_t is not what you + expect, but a struct instead, just with the same name. + So to make clang happy we'll use static_cast now, although + this will for sure show various other issues on 32bit as not all + possible config values will fit into 32bit numbers. + Fixing this will need a lot of upstream work unfortunately. + + -- Bernd Zeimetz Sun, 26 Jan 2020 15:39:29 +0100 ceph (14.2.6-5) unstable; urgency=medium diff --cc debian/patches/series index 8f0e191cf,dce2afd01..2560410eb --- a/debian/patches/series +++ b/debian/patches/series @@@ -13,6 -13,3 +13,5 @@@ fix-clang-build.patc 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