From patchwork Thu Oct 7 12:43:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 33668 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E6A7327BBE1; Thu, 7 Oct 2021 13:49:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F143F27BBE3 for ; Thu, 7 Oct 2021 13:49:32 +0100 (BST) Received: from localhost ([::1]:50178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYSq3-0006Qb-Sk for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 08:49:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYSli-0002Vt-PQ for guix-patches@gnu.org; Thu, 07 Oct 2021 08:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYSli-0004LP-F4 for guix-patches@gnu.org; Thu, 07 Oct 2021 08:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYSli-0000iT-D6 for guix-patches@gnu.org; Thu, 07 Oct 2021 08:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51077] [PATCH] gnu: ceph: Fix breaking change in snappy. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 12:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51077@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16336106562672 (code B ref -1); Thu, 07 Oct 2021 12:45:02 +0000 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: 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 -- 2.33.0 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 ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 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