GNU bug report logs - #51077
[PATCH] gnu: ceph: Fix breaking change in snappy.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51077 in the body.
You can then email your comments to 51077 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: ceph: Fix breaking change in snappy.
Date: Thu, 7 Oct 2021 08:43:41 -0400

[Message part 1 (text/plain, inline)]

fio is broken due to it's dependency on ceph (the only dependency according
to `guix refresh -l`).


From 57e9c43958e57a76e215b7fb9a97ab52c8e5d2d9 Mon Sep 17 00:00:00 2001
From: Greg Hogan <code <at> greghogan.com>
Date: Tue, 5 Oct 2021 17:55:04 +0000
Subject: [PATCH] gnu: ceph: Fix breaking change in snappy.

* gnu/packages/storage.scm (ceph)[source]: Add patch.
* gnu/packages/patches/ceph-fix-snappy-breaking-change.patch: New file.
* gnu/local.mk: Add it.
---
 gnu/local.mk                                        |  1 +
 .../patches/ceph-fix-snappy-breaking-change.patch   | 13 +++++++++++++
 gnu/packages/storage.scm                            |  5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644
gnu/packages/patches/ceph-fix-snappy-breaking-change.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 91915e780b..73995eec2c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -919,6 +919,7 @@ dist_patch_DATA = \
   %D%/packages/patches/cdparanoia-fpic.patch \
   %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \
   %D%/packages/patches/ceph-disable-cpu-optimizations.patch \
+  %D%/packages/patches/ceph-fix-snappy-breaking-change.patch \
   %D%/packages/patches/chez-scheme-build-util-paths-backport.patch      \
   %D%/packages/patches/chmlib-inttypes.patch \
   %D%/packages/patches/cl-asdf-config-directories.patch \
diff --git a/gnu/packages/patches/ceph-fix-snappy-breaking-change.patch
b/gnu/packages/patches/ceph-fix-snappy-breaking-change.patch
new file mode 100644
index 0000000000..7a10e2e4ae
--- /dev/null
+++ b/gnu/packages/patches/ceph-fix-snappy-breaking-change.patch
@@ -0,0 +1,13 @@
+Patch tracked upstream at https://tracker.ceph.com/issues/50934
+
+--- a/src/compressor/snappy/SnappyCompressor.h
++++ b/src/compressor/snappy/SnappyCompressor.h
+@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor {
+     if (qat_enabled)
+       return qat_accel.decompress(p, compressed_len, dst);
+ #endif
+-    snappy::uint32 res_len = 0;
++    uint32_t res_len = 0;
+     BufferlistSource source_1(p, compressed_len);
+     if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
+       return -1;
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index d53327df75..4dfae1e80e 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2017 Rutger Helling <rhelling <at> mykolab.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2021 Greg Hogan <code <at> greghogan.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,7 +65,9 @@
                (base32
                 "0lmdri415hqczc9565s5m5568pnj97ipqxgnw6085kps0flwq5zh"))
               (patches
-               (search-patches "ceph-disable-cpu-optimizations.patch"))
+               (search-patches
+                "ceph-disable-cpu-optimizations.patch"
+                "ceph-fix-snappy-breaking-change.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
--
2.33.0

[Message part 2 (text/html, inline)]

[0001-gnu-ceph-Fix-breaking-change-in-snappy.patch (application/octet-stream, attachment)]

Message #8 received at 51077 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Greg Hogan <code <at> greghogan.com>
Cc: 51077 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: ceph: Fix breaking change in snappy.
Date: Thu, 07 Oct 2021 15:01:40 +0200

Hi,

> diff --git a/gnu/packages/patches/ceph-fix-snappy-breaking-
> change.patch
> b/gnu/packages/patches/ceph-fix-snappy-breaking-change.patch
> new file mode 100644
> index 0000000000..7a10e2e4ae
> --- /dev/null
> +++ b/gnu/packages/patches/ceph-fix-snappy-breaking-change.patch
> @@ -0,0 +1,13 @@
> +Patch tracked upstream at https://tracker.ceph.com/issues/50934
> +
> +--- a/src/compressor/snappy/SnappyCompressor.h
> ++++ b/src/compressor/snappy/SnappyCompressor.h
> +@@ -96,7 +96,7 @@ class SnappyCompressor : public Compressor {
> +     if (qat_enabled)
> +       return qat_accel.decompress(p, compressed_len, dst);
> + #endif
> +-    snappy::uint32 res_len =3D 0;
> ++    uint32_t res_len =3D 0;
> +     BufferlistSource source_1(p, compressed_len);
> +     if (!snappy::GetUncompressedLength(&source_1, &res_len)) {
> +       return -1;
Instead of patching this line, this can be solved via substitute*
(either as a snippet or in an additional build phase).  Could you send
an updated patch?

Regards,
Liliana

Message #13 received at 51077-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Greg Hogan <code <at> greghogan.com>, 51077-done <at> debbugs.gnu.org
Subject: Re: [bug#51077] [PATCH] gnu: ceph: Fix breaking change in snappy.
Date: Thu, 07 Oct 2021 23:53:27 +0200

[Message part 1 (text/plain, inline)]

Greg Hogan <code <at> greghogan.com> skriver:

> Subject: [PATCH] gnu: ceph: Fix breaking change in snappy.
>
> * gnu/packages/storage.scm (ceph)[source]: Add patch.
> * gnu/packages/patches/ceph-fix-snappy-breaking-change.patch: New file.
> * gnu/local.mk: Add it.

Applied, thanks!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.