From owner-dev-commits-ports-all@freebsd.org Tue May 11 12:42:30 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49A396368B0; Tue, 11 May 2021 12:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FfcyG1R6Gz3rK4; Tue, 11 May 2021 12:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2399D18511; Tue, 11 May 2021 12:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14BCgUx4061788; Tue, 11 May 2021 12:42:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BCgUZo061787; Tue, 11 May 2021 12:42:30 GMT (envelope-from git) Date: Tue, 11 May 2021 12:42:30 GMT Message-Id: <202105111242.14BCgUZo061787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 50ea41c1535f - main - net/ceph14: unbreak build after recent API changes in archivers/snappy MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50ea41c1535f68834fe08a1a2625eb0f930f3bca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 12:42:30 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=50ea41c1535f68834fe08a1a2625eb0f930f3bca commit 50ea41c1535f68834fe08a1a2625eb0f930f3bca Author: Dima Panov AuthorDate: 2021-05-11 12:41:06 +0000 Commit: Dima Panov CommitDate: 2021-05-11 12:41:06 +0000 net/ceph14: unbreak build after recent API changes in archivers/snappy Snappy now drops own rewrite for cstdint types such as uint32_t Bump PORTREVISION to force rebuid with new snappy API changes Pointyhat to: vanilla (for skip consumers' testbuilds) --- net/ceph14/Makefile | 2 +- .../patch-src_compressor_snappy_SnappyCompressor.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 0b3fba537051..22c90093c3de 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -3,7 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net PKGNAMESUFFIX= 14 diff --git a/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h b/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h new file mode 100644 index 000000000000..313c4edb8265 --- /dev/null +++ b/net/ceph14/files/patch-src_compressor_snappy_SnappyCompressor.h @@ -0,0 +1,19 @@ +--- src/compressor/snappy/SnappyCompressor.h.orig 2020-08-10 20:15:22 UTC ++++ src/compressor/snappy/SnappyCompressor.h +@@ -15,6 +15,7 @@ + #ifndef CEPH_SNAPPYCOMPRESSOR_H + #define CEPH_SNAPPYCOMPRESSOR_H + ++#include + #include + #include + #include "common/config.h" +@@ -96,7 +97,7 @@ class SnappyCompressor : public Compressor { + if (qat_enabled) + return qat_accel.decompress(p, compressed_len, dst); + #endif +- snappy::uint32 res_len = 0; ++ std::uint32_t res_len = 0; + BufferlistSource source_1(p, compressed_len); + if (!snappy::GetUncompressedLength(&source_1, &res_len)) { + return -1;