[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/

[Patrick McLean]

commit:     1fc10bd005747daa1917f0c4d9394ae0ef1a70c9
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 18:35:21 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 20:29:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fc10bd0

sys-cluster/ceph: 17.2.3 more gcc12 fixes (bug #866039), bug #865509

- Fix system-boost boost dependency (bug #865509)
- Remove some documentation from patches to reduce the size of the files
  directory
- Drop old snappy dep since it's no longer in the tree

Bug: https://bugs.gentoo.org/865509
Closes: https://bugs.gentoo.org/866039
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 .../{ceph-17.2.3.ebuild => ceph-17.2.3-r1.ebuild}  |  4 +--
 .../ceph/files/ceph-17.2.0-cyclic-deps.patch       | 29 -------------------
 sys-cluster/ceph/files/ceph-17.2.1-python310.patch | 23 ---------------
 sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch     | 33 +++++++++++++++++-----
 4 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/sys-cluster/ceph/ceph-17.2.3.ebuild b/sys-cluster/ceph/ceph-17.2.3-r1.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-17.2.3.ebuild
rename to sys-cluster/ceph/ceph-17.2.3-r1.ebuild
index 49a8857b5c24..737e960de9d5 100644
--- a/sys-cluster/ceph/ceph-17.2.3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.3-r1.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
-	|| ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 )
+	>=app-arch/snappy-1.1.9-r1
 	app-arch/zstd:=
 	app-shells/bash:0
 	app-misc/jq:=
@@ -99,7 +99,7 @@ DEPEND="
 	rdma? ( sys-cluster/rdma-core:= )
 	spdk? ( dev-util/cunit )
 	sqlite? ( dev-db/sqlite:= )
-	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] )
+	system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP},zlib] )
 	uring? ( sys-libs/liburing:= )
 	xfs? ( sys-fs/xfsprogs:= )
 	zbd? ( sys-block/libzbd:= )

diff --git a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
index f80edddd8de7..e9177cc02764 100644
--- a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
+++ b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
@@ -1,32 +1,3 @@
-From 78edb6a91788133334ceeeda0c95529df5f40da8 Mon Sep 17 00:00:00 2001
-From: "Kaleb S. KEITHLEY" <kkeithle@××××××.com>
-Date: Mon, 14 Feb 2022 07:42:08 -0500
-Subject: [PATCH] rgw: cmake configure error on fedora-37/rawhide
-
-see
-https://kojipkgs.fedoraproject.org//work/tasks/6624/82706624/build.log,
-excerpted below
-
-...
-CMake Error: The inter-target dependency graph contains the following
-strongly connected component (cycle): "rgw_common" of type
-STATIC_LIBRARY depends on "dbstore" (weak) depends on "sqlite_db" (weak)
-"dbstore" of type SHARED_LIBRARY depends on "rgw_common" (weak) depends
-on "sqlite_db" (weak) "sqlite_db" of type SHARED_LIBRARY depends on
-"rgw_common" (weak) depends on "dbstore" (weak) At least one of these
-targets is not a STATIC_LIBRARY. Cyclic dependencies are allowed only
-among static libraries. CMake Generate step failed. Build files cannot
-be regenerated correctly.
-...
-
-https://tracker.ceph.com/issues/54266
-
-Signed-off-by: Kaleb S. KEITHLEY <kkeithle@××××××.com>
----
- src/rgw/store/dbstore/CMakeLists.txt        | 2 +-
- src/rgw/store/dbstore/sqlite/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
 diff --git a/src/rgw/store/dbstore/CMakeLists.txt b/src/rgw/store/dbstore/CMakeLists.txt
 index 143ede3c094c9..18e032b73f54f 100644
 --- a/src/rgw/store/dbstore/CMakeLists.txt

diff --git a/sys-cluster/ceph/files/ceph-17.2.1-python310.patch b/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
index 767cd2922a26..959e98a8067a 100644
--- a/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
+++ b/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
@@ -1,26 +1,3 @@
-From 389054888f2aa782f73564125ec7a1ef0212d536 Mon Sep 17 00:00:00 2001
-From: Pete Zaitcev <zaitcev@××××××.com>
-Date: Tue, 14 Dec 2021 23:04:34 -0600
-Subject: [PATCH] mgr: Define PY_SSIZE_T_CLEAN ahead of every Python.h
-
-Building on Fedora 35 with Python 3.10 makes vstart to loop
-forever, throwing the following message:
-
- Error EINVAL: SystemError: PY_SSIZE_T_CLEAN macro must be
- defined for '#' formats
-
-I followed the hint in the following document:
- https://docs.python.org/3/c-api/intro.html
-
-It says "recommended" to always define PY_SSIZE_T_CLEAN,
-but as you can see it is actually required in our case.
-
-Fixes: https://tracker.ceph.com/issues/53441
-Signed-off-by: Pete Zaitcev <zaitcev@××××××.com>
----
- src/mgr/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
 index 55147af4fc6ba..8f39e41ac0694 100644
 --- a/src/mgr/CMakeLists.txt

diff --git a/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch b/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
index e5e77b4116f6..356da385fedb 100644
--- a/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
+++ b/sys-cluster/ceph/files/ceph-17.2.3-gcc12.patch
@@ -1,12 +1,31 @@
 diff --git a/src/include/buffer.h b/src/include/buffer.h
-index 0c89367dd3b..98fcd7c3e08 100644
+index 7c8f90e9fb5d3..71cb01935000b 100644
 --- a/src/include/buffer.h
 +++ b/src/include/buffer.h
-@@ -62,6 +62,7 @@
- #endif
- 
- #include "inline_memory.h"
+@@ -41,6 +41,7 @@
+ #include <iosfwd>
+ #include <iomanip>
+ #include <list>
 +#include <memory>
+ #include <vector>
+ #include <string>
+ #if __cplusplus >= 201703L
+
+diff --git a/src/test/encoding.cc b/src/test/encoding.cc
+index 6d252fae18b71..f18901cbd27d9 100644
+--- a/src/test/encoding.cc
++++ b/src/test/encoding.cc
+@@ -334,11 +334,11 @@ void lame_decoder(int which) {
+ }
  
- #define CEPH_BUFFER_API
- 
+ TEST(EncodingException, Macros) {
+-  for (unsigned i = 0; i < sizeof(expected_what)/sizeof(expected_what[0]); i++) {
++  for (unsigned i = 0; i < std::size(expected_what); i++) {
+     try {
+       lame_decoder(i);
+     } catch (const exception& e) {
+-      ASSERT_EQ(string(expected_what[i]), string(e.what()));
++      ASSERT_NE(string(e.what()).find(expected_what[i]), string::npos);
+     }
+   }
+ }