From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63D36158086 for ; Fri, 29 Oct 2021 20:49:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E929E0821; Fri, 29 Oct 2021 20:49:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 239F8E0821 for ; Fri, 29 Oct 2021 20:49:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AE513431AF for ; Fri, 29 Oct 2021 20:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A0C915A for ; Fri, 29 Oct 2021 20:49:45 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1635540565.addb9b18a8f99b1be688372f1bb0e2d95cd4ace6.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-14.2.22.ebuild sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch X-VCS-Directories: sys-cluster/ceph/ sys-cluster/ceph/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: addb9b18a8f99b1be688372f1bb0e2d95cd4ace6 X-VCS-Branch: master Date: Fri, 29 Oct 2021 20:49:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c91c2e4f-d032-4b73-bc58-1978f3640505 X-Archives-Hash: 0f11e2f1d08b64afd25efd7431079516 commit: addb9b18a8f99b1be688372f1bb0e2d95cd4ace6 Author: Patrick McLean sony com> AuthorDate: Fri Oct 29 20:49:25 2021 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Oct 29 20:49:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=addb9b18 sys-cluster/ceph: 14.2.22 add fix for newer snappy Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/ceph-14.2.22.ebuild | 1 + sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sys-cluster/ceph/ceph-14.2.22.ebuild b/sys-cluster/ceph/ceph-14.2.22.ebuild index 1288ebd6a78..7e642968cc1 100644 --- a/sys-cluster/ceph/ceph-14.2.22.ebuild +++ b/sys-cluster/ceph/ceph-14.2.22.ebuild @@ -185,6 +185,7 @@ PATCHES=( "${FILESDIR}/ceph-14.2.22-build-without-mgr.patch" "${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch" "${FILESDIR}/ceph-15.2.9-dont-compile-isal_compress-if-don-t-have-SSE4_1.patch" + "${FILESDIR}/ceph-14.2.22-snappy-uint32.patch" ) check-reqs_export_vars() { diff --git a/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch new file mode 100644 index 00000000000..c783558a175 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.22-snappy-uint32.patch @@ -0,0 +1,13 @@ +diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h +index 0291a923112..352ab9a9bcf 100644 +--- 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;