Your message dated Wed, 13 Sep 2017 03:04:23 +0000
with message-id <[email protected]>
and subject line Bug#875640: fixed in cryfs 0.9.7-2
has caused the Debian Bug report #875640,
regarding cryfs: FTBFS with glibc 2.25 and higher
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
875640: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=875640
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: cryfs
Version: 0.9.7-1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu artful ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* CHAR_WIDTH.patch: Backport a commit from upstream to avoid collision
with ISO/IEC TS 18661-1:2014 CHAR_WIDTH macro now included in glibc.
Should be fairly self-explanatory. Note that updating to a new upstream
version would also include this fix and close the bug, as they seem to
have updated their vendor copy.
... Adam
-- System Information:
Debian Release: stretch/sid
APT prefers artful
APT policy: (500, 'artful')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.12.0-12-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cryfs-0.9.7/debian/patches/CHAR_WIDTH.patch
cryfs-0.9.7/debian/patches/CHAR_WIDTH.patch
--- cryfs-0.9.7/debian/patches/CHAR_WIDTH.patch 1969-12-31 17:00:00.000000000
-0700
+++ cryfs-0.9.7/debian/patches/CHAR_WIDTH.patch 2017-09-12 14:14:10.000000000
-0600
@@ -0,0 +1,52 @@
+From abbefd71666055daac9e14e78262620f9e845850 Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <[email protected]>
+Date: Wed, 19 Oct 2016 06:52:55 -0700
+Subject: [PATCH] CHAR_WIDTH -> CHAR_SIZE to avoid collision with ISO/IEC TS
+ 18661-1:2014 macro
+
+---
+ fmt/format.h | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/fmt/format.h b/fmt/format.h
+index ae7bd493..de1475bc 100644
+--- a/vendor/spdlog/spdlog/fmt/bundled/format.h
++++ b/vendor/spdlog/spdlog/fmt/bundled/format.h
+@@ -2233,29 +2233,29 @@
+ typedef typename BasicWriter<Char>::CharPtr CharPtr;
+ Char fill = internal::CharTraits<Char>::cast(spec_.fill());
+ CharPtr out = CharPtr();
+- const unsigned CHAR_WIDTH = 1;
+- if (spec_.width_ > CHAR_WIDTH)
++ const unsigned CHAR_SIZE = 1;
++ if (spec_.width_ > CHAR_SIZE)
+ {
+ out = writer_.grow_buffer(spec_.width_);
+ if (spec_.align_ == ALIGN_RIGHT)
+ {
+- std::uninitialized_fill_n(out, spec_.width_ - CHAR_WIDTH,
fill);
+- out += spec_.width_ - CHAR_WIDTH;
++ std::uninitialized_fill_n(out, spec_.width_ - CHAR_SIZE,
fill);
++ out += spec_.width_ - CHAR_SIZE;
+ }
+ else if (spec_.align_ == ALIGN_CENTER)
+ {
+ out = writer_.fill_padding(out, spec_.width_,
+- internal::const_check(CHAR_WIDTH),
fill);
++ internal::const_check(CHAR_SIZE),
fill);
+ }
+ else
+ {
+- std::uninitialized_fill_n(out + CHAR_WIDTH,
+- spec_.width_ - CHAR_WIDTH, fill);
++ std::uninitialized_fill_n(out + CHAR_SIZE,
++ spec_.width_ - CHAR_SIZE, fill);
+ }
+ }
+ else
+ {
+- out = writer_.grow_buffer(CHAR_WIDTH);
++ out = writer_.grow_buffer(CHAR_SIZE);
+ }
+ *out = internal::CharTraits<Char>::cast(value);
+ }
diff -Nru cryfs-0.9.7/debian/patches/series cryfs-0.9.7/debian/patches/series
--- cryfs-0.9.7/debian/patches/series 2017-05-17 18:50:07.000000000 -0600
+++ cryfs-0.9.7/debian/patches/series 2017-09-12 14:15:55.000000000 -0600
@@ -1,2 +1,3 @@
build-test
disable-mars-test
+CHAR_WIDTH.patch
--- End Message ---
--- Begin Message ---
Source: cryfs
Source-Version: 0.9.7-2
We believe that the bug you reported is fixed in the latest version of
cryfs, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
David Steele <[email protected]> (supplier of updated cryfs package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 12 Sep 2017 20:55:01 -0400
Source: cryfs
Binary: cryfs
Architecture: source amd64
Version: 0.9.7-2
Distribution: unstable
Urgency: medium
Maintainer: David Steele <[email protected]>
Changed-By: David Steele <[email protected]>
Description:
cryfs - encrypt your files and store them in the cloud
Closes: 875640
Changes:
cryfs (0.9.7-2) unstable; urgency=medium
.
* Fix FTBFS due to macro overload in spdlog (Closes: #875640).
Thanks Victor Zverovich.
* Save the upstream tar signature for archiving.
Checksums-Sha1:
6c636a9f6fa8f49232a34d1100de0f7ea4afbdd8 2049 cryfs_0.9.7-2.dsc
e343175bb92026fda584f1285dc329954d9edb9a 9744 cryfs_0.9.7-2.debian.tar.xz
16253e0b203db3e29a3bd4b6b49251abc31a9cba 29862884
cryfs-dbgsym_0.9.7-2_amd64.deb
74427b68064cfb954cda11bb6770a637bf954899 9284 cryfs_0.9.7-2_amd64.buildinfo
bf41e75ff1c4f994b17efe5ddbbdb072e90cc424 616620 cryfs_0.9.7-2_amd64.deb
Checksums-Sha256:
301d85391a85e3cde0be72f3e9fb7e9d71a8d265be96106ae0042f3602285a7f 2049
cryfs_0.9.7-2.dsc
45906126dbeff779d05e020239e89c833b0c7f22cc5e1a332917915ac115f6c0 9744
cryfs_0.9.7-2.debian.tar.xz
3e5cc2ab5cdb34f44d8c394ab541412f6f967ad1f54fbf8e3162189caa31d03e 29862884
cryfs-dbgsym_0.9.7-2_amd64.deb
928a69352e3ad3e4e68b5896c905e1acb347334f6ab9e9157ff1f9913a2ce587 9284
cryfs_0.9.7-2_amd64.buildinfo
24243a9e3cebef05a8ec5e9cd789cb29f346954a0ebb9585fac9daa06b3a2fa6 616620
cryfs_0.9.7-2_amd64.deb
Files:
01c3691bbdfc7597d6058ceb2bf1f787 2049 utils optional cryfs_0.9.7-2.dsc
deb987a200ad7cacc15555dd090066ea 9744 utils optional
cryfs_0.9.7-2.debian.tar.xz
af3f0de95425bbf0391e0f792a77d013 29862884 debug optional
cryfs-dbgsym_0.9.7-2_amd64.deb
6d9336e4e961f2f3d7b716f544e4a46b 9284 utils optional
cryfs_0.9.7-2_amd64.buildinfo
bd05f083aad80b2f30e5ec561cdd83a2 616620 utils optional cryfs_0.9.7-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCAAwFiEEFsJFjKR5Lf0iLhKW539ua4FQpagFAlm4jvMSHHN0ZWVsZUBk
ZWJpYW4ub3JnAAoJEOd/bmuBUKWodTQQAJjkjgVnsI5/rz+oM0ZMzBymfPLxRiyj
fX4x1pguePPqailSFS9Gh8kUhAcWrj8OqSHShjUKs7pm1Y9GTHRw4PqrfRZQb5cg
2J487prJfwn4KrU5g8bANleYPJ2wv9PisqFqmH66Oqko5Q8DpmPJ6QDHSfJh62M6
6QHXYCiXdZIsCJ5slqqrJ6/u73Ye0CvM3hqPiGKlh9T0DSgXgjo2IUeJU/UPe2vk
pzm4x0Qu0uBM3aiCSxbANFlARWdPCNtcyDZV9obW4+Hwa/n6gLmL9aioy2SSHbZ0
6Agr32IbmVqhogA9K1wq7ymNbWvNLTumIMv0iww4/jUwPeUtKQ8X7rOPfIFROc+J
wg08BHFomvPG00Lznqq7clEorcyeGB1Kz2g4rCyRHmme5GMDeqTOq/kJaWi7a8lj
4MAv85BzuCr6RsgBoJpy2fe8EFEQ2V2BiDYm9z6UAapWTwFv7Ik+K1ADIz+flxfO
veLowrJRzeXDfDf2qtw++/YppfENsgj4JFbecDMYp0p4tptz0ulmqnpDRd+scctp
SRNTkLA4j9QHtpeRErR5/QrDo4MOTYoIp1l0aQM6FLa57Tw7nViz0lwgpey0ZHs/
PTGz7R+iUyOCUc541V0Hafwc4XUxIM95oyTv2Fp/BDrQNudPm0KG/F8HaoauWX/E
KBh94RCgG2Hj
=riLm
-----END PGP SIGNATURE-----
--- End Message ---
