From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 07 08:44:16 2021 Received: (at submit) by debbugs.gnu.org; 7 Oct 2021 12:44:16 +0000 Received: from localhost ([127.0.0.1]:46291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYSkt-0000gw-3V for submit@debbugs.gnu.org; Thu, 07 Oct 2021 08:44:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:46396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYSkr-0000gn-PT for submit@debbugs.gnu.org; Thu, 07 Oct 2021 08:44:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYSkr-0001Cj-07 for guix-patches@gnu.org; Thu, 07 Oct 2021 08:44:09 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]:34347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYSkc-00074f-4b for guix-patches@gnu.org; Thu, 07 Oct 2021 08:44:08 -0400 Received: by mail-io1-xd2b.google.com with SMTP id h189so3731845iof.1 for ; Thu, 07 Oct 2021 05:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=qxlU/MfiLhFJglkwiN2UuNOUO+fRDUpgKY15X1aA9js=; b=amWTySjoDr6pgS7P27XCn0ecIDFSrR77LsuMx0fam0tI20sPaXX8iszUHg0wABGh1G HYBBSiq4Zl3unrt/inDWtpPs646ZO6OlXQRkl1CI3p7a+RrSpGVxa6dYY9WgiyGkzBnb NadIO7CEeNougn5pDXYcGDZlYlAbSsDcU8DQUXndI1vkA+IaBU0JoV/lckD0eXFMX0EU VqCiizamDDnLfRXGoZIXjVF5lqpqbYMztRSUJl3VQCqsJg2zJGTLevpc8oCJcAzN7Rmz MrfHS6DYWIDV5kNg17dX/UY6lNHnGrlS8Bwe8e9WgYsNGbH5YQHnnSOpXwcGvg8+TkgB GC3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=qxlU/MfiLhFJglkwiN2UuNOUO+fRDUpgKY15X1aA9js=; b=fc6/aD4jeL8YVl6VDcxslQue6M3bDPLDSLFL2HZCrWQc+Ftah6voEDdEqiYihq/6FR 0KNVHfbTxFFem+vRSp7IMV9/fqr4oLh0BRdONYE3dsujq7yvrMoihRn/FG3JYtdzUaLj MoNeG2wc/tC4hVRVCTSjG842mGHEbMUYbJ3IeyWeGS7LTmdcJFM00FGggMAjtnwnr/PM E+phYLMqLAxQv0bYR39/+tuRmwP0ywmko4G5hgPkN+e7Aawk8geLpr6FOfDwIrMCODXw kU+HMeAP0Sy+TnJXqADxLSugQhXi3a5bJHD/7gHgTdIJOa8yTUl5Qc9tyejFh9WXICKe +B9g== X-Gm-Message-State: AOAM533mixV13eItZnmHeZa3WYdILcS72LUBD79YL4cGKHjMeB69rXyc hZpRIAVqGPMgz+2cevLCA0A3DzQZ0ADF+hp9u79Ko30eSUTJXVPwjZ0= X-Google-Smtp-Source: ABdhPJytA1s7FXG2q1eQfsMe0px7VJrhDsf2Wvou27J2J52Cc+c8OM/TtUZJ3d3ytnvUH46eQiAZRdpIRp/OZWIlLw0= X-Received: by 2002:a05:6638:3726:: with SMTP id k38mr2799379jav.105.1633610631793; Thu, 07 Oct 2021 05:43:51 -0700 (PDT) MIME-Version: 1.0 From: Greg Hogan Date: Thu, 7 Oct 2021 08:43:41 -0400 Message-ID: Subject: [PATCH] gnu: ceph: Fix breaking change in snappy. To: guix-patches@gnu.org Content-Type: multipart/mixed; boundary="00000000000068fb4f05cdc29d68" Received-SPF: none client-ip=2607:f8b0:4864:20::d2b; envelope-from=code@greghogan.com; helo=mail-io1-xd2b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000068fb4f05cdc29d68 Content-Type: multipart/alternative; boundary="00000000000068fb4d05cdc29d66" --00000000000068fb4d05cdc29d66 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 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 =3D \ %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 =3D 0; ++ uint32_t res_len =3D 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 =C2=A9 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2021 Greg Hogan ;;; ;;; 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 --00000000000068fb4d05cdc29d66 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
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@greghogan.com>
Date: Tue, 5 Oct 2021 17:55:04 +0000
S= ubject: [PATCH] gnu: ceph: Fix breaking change in snappy.

* gnu/pack= ages/storage.scm (ceph)[source]: Add patch.
* gnu/packages/patches/ceph-= fix-snappy-breaking-change.patch: New file.
* gnu/local.mk: Add it.
---
=C2=A0gnu/local.mk =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| =C2=A01 +
=C2=A0.../patches/ceph-fix-snappy-breaking-change.patc= h =C2=A0 | 13 +++++++++++++
=C2=A0gnu/packages/storage.scm =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| =C2=A05 ++++-
=C2=A03 files changed, 18 insertions(+), 1 del= etion(-)
=C2=A0create mode 100644 gnu/packages/patches/ceph-fix-snappy-b= reaking-change.patch

diff --git a/gnu/lo= cal.mk b/gnu/local.mk
index 91915e78= 0b..73995eec2c 100644
--- a/gnu/local.mk=
+++ b/gnu/local.mk
@@ -919,6 +919,7 = @@ dist_patch_DATA =3D \
=C2=A0 =C2=A0%D%/packages/patches/cdparano= ia-fpic.patch \
=C2=A0 =C2=A0%D%/packages/patches/cdrtools-3.01-mkisof= s-isoinfo.patch \
=C2=A0 =C2=A0%D%/packages/patches/ceph-disable-cpu-op= timizations.patch \
+ =C2=A0%D%/packages/patches/ceph-fix-snappy-breakin= g-change.patch \
=C2=A0 =C2=A0%D%/packages/patches/chez-scheme-build-uti= l-paths-backport.patch =C2=A0 =C2=A0 =C2=A0\
=C2=A0 =C2=A0%D%/packages/p= atches/chmlib-inttypes.patch \
=C2=A0 =C2=A0%D%/packages/patches/cl-as= df-config-directories.patch \
diff --git a/gnu/packages/patches/ceph-fi= x-snappy-breaking-change.patch b/gnu/packages/patches/ceph-fix-snappy-break= ing-change.patch
new file mode 100644
index 0000000000..7a10e2e4ae--- /dev/null
+++ b/gnu/packages/patches/ceph-fix-snappy-breaking-chang= e.patch
@@ -0,0 +1,13 @@
+Patch tracked upstream at https://tracker.ceph.com/issues/50934<= br>+
+--- a/src/compressor/snappy/SnappyCompressor.h
++++ b/src/compr= essor/snappy/SnappyCompressor.h
+@@ -96,7 +96,7 @@ class SnappyCompresso= r : public Compressor {
+ =C2=A0 =C2=A0 if (qat_enabled)
+ =C2=A0 =C2= =A0 =C2=A0 return qat_accel.decompress(p, compressed_len, dst);
+ #endif=
+- =C2=A0 =C2=A0snappy::uint32 res_len =3D 0;
++ =C2=A0 =C2=A0uint32= _t res_len =3D 0;
+ =C2=A0 =C2=A0 BufferlistSource source_1(p, compresse= d_len);
+ =C2=A0 =C2=A0 if (!snappy::GetUncompressedLength(&source_1= , &res_len)) {
+ =C2=A0 =C2=A0 =C2=A0 return -1;
diff --git a/gnu= /packages/storage.scm b/gnu/packages/storage.scm
index d53327df75..4dfae= 1e80e 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storag= e.scm
@@ -2,6 +2,7 @@
=C2=A0;;; Copyright =C2=A9 2017, 2018, 2019, 20= 20 Marius Bakke <mbakke@fastmail.= com>
=C2=A0;;; Copyright =C2=A9 2017 Rutger Helling <rhelling@mykolab.com>
=C2=A0;;; = Copyright =C2=A9 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright =C2=A9 2021 Greg Hogan <code@greghogan.com>
=C2=A0;;;=C2=A0;;; This file is part of GNU Guix.
=C2=A0;;;
@@ -64,7 +65,9 @= @
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (base32
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"0lmdri415h= qczc9565s5m5568pnj97ipqxgnw6085kps0flwq5zh"))
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(patches
- =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 (search-patches "ceph-disable-cpu-optimizations.= patch"))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (search= -patches
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"= ceph-disable-cpu-optimizations.patch"
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0"ceph-fix-snappy-breaking-change.patch&quo= t;))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(modules = 9;((guix build utils)))
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0(snippet
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = '(begin
--
2.33.0
--00000000000068fb4d05cdc29d66-- --00000000000068fb4f05cdc29d68 Content-Type: application/octet-stream; name="0001-gnu-ceph-Fix-breaking-change-in-snappy.patch" Content-Disposition: attachment; filename="0001-gnu-ceph-Fix-breaking-change-in-snappy.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kugxjblu0 RnJvbSA1N2U5YzQzOTU4ZTU3YTc2ZTIxNWI3ZmI5YTk3YWI1MmM4ZTVkMmQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHcmVnIEhvZ2FuIDxjb2RlQGdyZWdob2dhbi5jb20+CkRhdGU6 IFR1ZSwgNSBPY3QgMjAyMSAxNzo1NTowNCArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIGdudTogY2Vw aDogRml4IGJyZWFraW5nIGNoYW5nZSBpbiBzbmFwcHkuCgoqIGdudS9wYWNrYWdlcy9zdG9yYWdl LnNjbSAoY2VwaClbc291cmNlXTogQWRkIHBhdGNoLgoqIGdudS9wYWNrYWdlcy9wYXRjaGVzL2Nl cGgtZml4LXNuYXBweS1icmVha2luZy1jaGFuZ2UucGF0Y2g6IE5ldyBmaWxlLgoqIGdudS9sb2Nh bC5tazogQWRkIGl0LgotLS0KIGdudS9sb2NhbC5tayAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAxICsKIC4uLi9wYXRjaGVzL2NlcGgtZml4LXNuYXBweS1icmVha2lu Zy1jaGFuZ2UucGF0Y2ggICB8IDEzICsrKysrKysrKysrKysKIGdudS9wYWNrYWdlcy9zdG9yYWdl LnNjbSAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICA1ICsrKystCiAzIGZpbGVzIGNoYW5n ZWQsIDE4IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBn bnUvcGFja2FnZXMvcGF0Y2hlcy9jZXBoLWZpeC1zbmFwcHktYnJlYWtpbmctY2hhbmdlLnBhdGNo CgpkaWZmIC0tZ2l0IGEvZ251L2xvY2FsLm1rIGIvZ251L2xvY2FsLm1rCmluZGV4IDkxOTE1ZTc4 MGIuLjczOTk1ZWVjMmMgMTAwNjQ0Ci0tLSBhL2dudS9sb2NhbC5taworKysgYi9nbnUvbG9jYWwu bWsKQEAgLTkxOSw2ICs5MTksNyBAQCBkaXN0X3BhdGNoX0RBVEEgPQkJCQkJCVwKICAgJUQlL3Bh Y2thZ2VzL3BhdGNoZXMvY2RwYXJhbm9pYS1mcGljLnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMv cGF0Y2hlcy9jZHJ0b29scy0zLjAxLW1raXNvZnMtaXNvaW5mby5wYXRjaCAJXAogICAlRCUvcGFj a2FnZXMvcGF0Y2hlcy9jZXBoLWRpc2FibGUtY3B1LW9wdGltaXphdGlvbnMucGF0Y2gJXAorICAl RCUvcGFja2FnZXMvcGF0Y2hlcy9jZXBoLWZpeC1zbmFwcHktYnJlYWtpbmctY2hhbmdlLnBhdGNo CVwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvY2hlei1zY2hlbWUtYnVpbGQtdXRpbC1wYXRocy1i YWNrcG9ydC5wYXRjaCAgICAgIFwKICAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvY2htbGliLWludHR5 cGVzLnBhdGNoCQkJXAogICAlRCUvcGFja2FnZXMvcGF0Y2hlcy9jbC1hc2RmLWNvbmZpZy1kaXJl Y3Rvcmllcy5wYXRjaAkJXApkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvY2VwaC1m aXgtc25hcHB5LWJyZWFraW5nLWNoYW5nZS5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2Nl cGgtZml4LXNuYXBweS1icmVha2luZy1jaGFuZ2UucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMC4uN2ExMGUyZTRhZQotLS0gL2Rldi9udWxsCisrKyBiL2dudS9wYWNr YWdlcy9wYXRjaGVzL2NlcGgtZml4LXNuYXBweS1icmVha2luZy1jaGFuZ2UucGF0Y2gKQEAgLTAs MCArMSwxMyBAQAorUGF0Y2ggdHJhY2tlZCB1cHN0cmVhbSBhdCBodHRwczovL3RyYWNrZXIuY2Vw aC5jb20vaXNzdWVzLzUwOTM0CisKKy0tLSBhL3NyYy9jb21wcmVzc29yL3NuYXBweS9TbmFwcHlD b21wcmVzc29yLmgKKysrKyBiL3NyYy9jb21wcmVzc29yL3NuYXBweS9TbmFwcHlDb21wcmVzc29y LmgKK0BAIC05Niw3ICs5Niw3IEBAIGNsYXNzIFNuYXBweUNvbXByZXNzb3IgOiBwdWJsaWMgQ29t cHJlc3NvciB7CisgICAgIGlmIChxYXRfZW5hYmxlZCkKKyAgICAgICByZXR1cm4gcWF0X2FjY2Vs LmRlY29tcHJlc3MocCwgY29tcHJlc3NlZF9sZW4sIGRzdCk7CisgI2VuZGlmCistICAgIHNuYXBw eTo6dWludDMyIHJlc19sZW4gPSAwOworKyAgICB1aW50MzJfdCByZXNfbGVuID0gMDsKKyAgICAg QnVmZmVybGlzdFNvdXJjZSBzb3VyY2VfMShwLCBjb21wcmVzc2VkX2xlbik7CisgICAgIGlmICgh c25hcHB5OjpHZXRVbmNvbXByZXNzZWRMZW5ndGgoJnNvdXJjZV8xLCAmcmVzX2xlbikpIHsKKyAg ICAgICByZXR1cm4gLTE7CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvc3RvcmFnZS5zY20gYi9n bnUvcGFja2FnZXMvc3RvcmFnZS5zY20KaW5kZXggZDUzMzI3ZGY3NS4uNGRmYWUxZTgwZSAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL3N0b3JhZ2Uuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9zdG9y YWdlLnNjbQpAQCAtMiw2ICsyLDcgQEAKIDs7OyBDb3B5cmlnaHQgwqkgMjAxNywgMjAxOCwgMjAx OSwgMjAyMCBNYXJpdXMgQmFra2UgPG1iYWtrZUBmYXN0bWFpbC5jb20+CiA7OzsgQ29weXJpZ2h0 IMKpIDIwMTcgUnV0Z2VyIEhlbGxpbmcgPHJoZWxsaW5nQG15a29sYWIuY29tPgogOzs7IENvcHly aWdodCDCqSAyMDIwIFRvYmlhcyBHZWVyaW5ja3gtUmljZSA8bWVAdG9iaWFzLmdyPgorOzs7IENv cHlyaWdodCDCqSAyMDIxIEdyZWcgSG9nYW4gPGNvZGVAZ3JlZ2hvZ2FuLmNvbT4KIDs7OwogOzs7 IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7CkBAIC02NCw3ICs2NSw5IEBACiAg ICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAgICAgICAgICAgIjBsbWRyaTQxNWhxY3pjOTU2 NXM1bTU1Njhwbmo5N2lwcXhnbnc2MDg1a3BzMGZsd3E1emgiKSkKICAgICAgICAgICAgICAgKHBh dGNoZXMKLSAgICAgICAgICAgICAgIChzZWFyY2gtcGF0Y2hlcyAiY2VwaC1kaXNhYmxlLWNwdS1v cHRpbWl6YXRpb25zLnBhdGNoIikpCisgICAgICAgICAgICAgICAoc2VhcmNoLXBhdGNoZXMKKyAg ICAgICAgICAgICAgICAiY2VwaC1kaXNhYmxlLWNwdS1vcHRpbWl6YXRpb25zLnBhdGNoIgorICAg ICAgICAgICAgICAgICJjZXBoLWZpeC1zbmFwcHktYnJlYWtpbmctY2hhbmdlLnBhdGNoIikpCiAg ICAgICAgICAgICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKICAgICAgICAgICAg ICAgKHNuaXBwZXQKICAgICAgICAgICAgICAgICcoYmVnaW4KLS0gCjIuMzMuMAoK --00000000000068fb4f05cdc29d68-- From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 07 09:01:50 2021 Received: (at 51077) by debbugs.gnu.org; 7 Oct 2021 13:01:50 +0000 Received: from localhost ([127.0.0.1]:46340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYT1x-0001Dx-U5 for submit@debbugs.gnu.org; Thu, 07 Oct 2021 09:01:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYT1v-0001Dh-TF for 51077@debbugs.gnu.org; Thu, 07 Oct 2021 09:01:48 -0400 Received: by mail-wr1-f65.google.com with SMTP id u18so18895580wrg.5 for <51077@debbugs.gnu.org>; Thu, 07 Oct 2021 06:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=ddIl1E5IfKwLuzE+lds8UkAABYfxqEfqO+VdDz6fFpA=; b=AvOuj3ZdSicXZvVJ56oApJLyufjlszAva8Jb+kIISg/EX/XcCnEb4yOELT77QhOok/ 2GAGROvHI0+3FCkoGqOnyFIodHzK89PICuszCRUeoEQL1JGvn/ni9vxeZks1lXYIchwW g33KwYhl9nUWFg/4L2nF94XO00FLsbiQnzsJzuBaMfkxcpbrl64kbMxuy0iVr6kP2c0J uFGxOp+Bf1XvaYfj+K3jwg39icyaTnQPT61RtF04pqAdLq+BPFhHddk//W34cGX9UZGt Zt/5hPUsDm6Mc1QSekuVP2BCRjoalmy+KOIQPfzdfj+0JekQj3lrt1ehHbxDz1bN3/WM DMNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=ddIl1E5IfKwLuzE+lds8UkAABYfxqEfqO+VdDz6fFpA=; b=njcesTqCyt3cKqVGGVnIBdaZpQEwiG0X97VEtZWS7vg0/fjWRAU3limPa9wd3seNRx IqFfxXMaoh/CO9kxQkHC9IwWZ4oSiBiQnKVmVpoqDFvtp0SRZCCu4/VQZg7gMMYY8XyN JZMTsn6qQPyiUMQzNZfvYDUI3wUy0geHpYmXd/XUOGr/K9/+g/HF1IE8gHLKzHDpMWTn w5ca5qikP8Ew4uxoY5JAorkrxpMc0AfHYiEuJ+9/SjcLVwkW28RuwQTZIak6sOGy8un/ 8MBTRN5ubkT6RoIGCf9y7qkwnYqUzHpSqGI0MYv2l5KOi5flmOrfGaqvIDZkXiNCcioY cEpw== X-Gm-Message-State: AOAM530pEfRcDZ+EKJtMy0Lsz/hHk9zpJLXl0tHYNkixsJmF00TdwRth YfgV637Gy9PJKDmgvtbS7yg= X-Google-Smtp-Source: ABdhPJyvsq21YfGNU7jItMyv/xvVAnwjPCdTZfOsPVBF8XvVwJh6Zwg9jTsfcrql0NIPRGRguSqTPQ== X-Received: by 2002:adf:b304:: with SMTP id j4mr5315215wrd.160.1633611701759; Thu, 07 Oct 2021 06:01:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d8sm25780271wrv.80.2021.10.07.06.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 06:01:41 -0700 (PDT) Message-ID: <20b24330259e80cd0225ce10bf78150d5299150d.camel@gmail.com> Subject: Re: [PATCH] gnu: ceph: Fix breaking change in snappy. From: Liliana Marie Prikler To: Greg Hogan Date: Thu, 07 Oct 2021 15:01:40 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51077 Cc: 51077@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 07 17:53:36 2021 Received: (at 51077-done) by debbugs.gnu.org; 7 Oct 2021 21:53:36 +0000 Received: from localhost ([127.0.0.1]:48568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYbKa-0006wR-EB for submit@debbugs.gnu.org; Thu, 07 Oct 2021 17:53:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYbKZ-0006wF-3r for 51077-done@debbugs.gnu.org; Thu, 07 Oct 2021 17:53:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49892) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYbKT-00025S-Md; Thu, 07 Oct 2021 17:53:29 -0400 Received: from host-37-191-236-102.lynet.no ([37.191.236.102]:45254 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYbKT-0001nm-By; Thu, 07 Oct 2021 17:53:29 -0400 From: Marius Bakke To: Greg Hogan , 51077-done@debbugs.gnu.org Subject: Re: [bug#51077] [PATCH] gnu: ceph: Fix breaking change in snappy. In-Reply-To: References: Date: Thu, 07 Oct 2021 23:53:27 +0200 Message-ID: <87bl40lcx4.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51077-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Greg Hogan 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYV9sVw8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHf0lgEA1dg3ELbfU+SK9+3/k6UcnWf9noGuAvYP7OSN oSHzB8kA/3IJCioHqjHS4pO/DpVpTkViJD9j8yPLQLmcyxer74MG =ZuHp -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 06 14:23:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 05 Nov 2021 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator