gentoo auto-resync : 12:09:2023 - 04:40:07

5 files changed, 102 insertions, 7 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 09548f82c245..f4aeaef590b6 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -11,6 +11,7 @@ AUX ceph-16.2.0-liburing.patch 1331 BLAKE2B 1f0e2e209cb827526b76e28f1334619c4d03
 AUX ceph-16.2.0-rocksdb-cmake.patch 705 BLAKE2B d40371aa0163cd78dbe12b1db648f4884b762e2ec2485663aa5cda83aea2175c8ee9a6b1a54e5ed9d68fbfda8c0ee0ef7625a67d948b6259227e56fb0ee69b52 SHA512 0c974ea937644b98dde6f20f1cab9b39c73f7fd8cc0fa0991e05de2e0a39fe69dee60a981c0ae14386f8c0c5c4073d5c8573e3bd0fa47d58b754351329eda220
 AUX ceph-16.2.0-spdk-tinfo.patch 344 BLAKE2B ea46ab83836ebc9ed96714e0ed3c3e8b00a221296ddf9b10a99eb5591740a844067078820d79ae784cdb600c97e2969e81c65a4fe3b958bcc9910f7cecb1a6fe SHA512 31b9ae63c8f1722e4834034ed04cfc9ab47665ecd8f24da356897b0c52787096acbfc9cccf600655938da0f9f39200c2470cdb087f389adba975b6d830e7228d
 AUX ceph-16.2.10-flags.patch 665 BLAKE2B 44d77ca5992c76dc6cf99fca4ca5deb6559b11f61839bd3c36eda5b71db774d18abaaa8b1e57a7286b45d775a45b8b26beef45a775e27aec34181de1623eab65 SHA512 a9480374cc8136e5013a33e93aff300ade1dfdc8a446ac8e91d9b15326caaf1557932806f45d122775540d717ddfac3f2a9dbd2d15bd71fdb5e8e86f2bd5925f
+AUX ceph-16.2.14-gcc13.patch 2683 BLAKE2B 92450cc3e51f6c266bd445bf50dd8bab4a800bd998781440bf689e290cf9d9ced8bcb570f09d037b7790a251ad30b7017a45a8dc363128230b908effe6acfcce SHA512 90ae1ffdb1b2c49f81a99781a020339edb261e55c86107b7a87605b5647c8372477fcbf840ca3b83ba31b133794399f6c8b91e46ee63aad84e401f038eb1998d
 AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03cedfa814a14165d51ec0daa38ad0124fbfa62d9ee7cf2895676248b14b45a38f310efb544e61e9672c58fb25d SHA512 d65b2b33f2e43169e5131ef3ca51617931fc3d362af8c79bef2baa2bbee6495729ee7a4fca4401a6be716283fcdf83511bdfb90e0c4b526b90e91c9c32591439
 AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a
 AUX ceph-16.2.8-no-virtualenvs.patch 3650 BLAKE2B 3c350e1ff171ec40443bcb2e8b844192bf07d8cc84181b9c20b11bfd8785e7bbf029ee9a6abc1d52655618417769b7f32d3e758cc9456f38e7ea918499bd9ab5 SHA512 f82210448617f448205b8a51fc286fc88c149ec65eb23b4ea439e5e69ad07d30d9fb254e2ffac13b2d18c7be8a0d69110c089ff22a301ee0fe92357fcfde9c25
@@ -46,12 +47,12 @@ AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca448
 AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c
 AUX rbdmap.initd-r1 2372 BLAKE2B dee62cc3e92425bccfce86009be0fbecc84d55923a7dde302727d42f5f7703642121c690bdf079878c31b71d4c6c200ae6a7f595ede2dfe0bc46d8f6f9f5dd01 SHA512 d249d2299ef8dc4bbd12237cfe6ef626704872130b1092ab96d05894f04df09418364552433b264b80e49ee7e1587ebee71c1131fbbcd7d858cfadf1fe6357d5
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-16.2.13.tar.gz 157213576 BLAKE2B cc319ff67f6320c101341d7bbca0d49630fd6d4a5ed48b34e73a9e780ddf934adc35e3ff09e32115fe4b9a853bff9a85ca2c1e5e62d5596251d2dae535726a28 SHA512 39ec2bed1de0276f08bf93241f9fb275893041fd5f20ade75e68728107011ae5d01aed532d5afd8805951d09061a5a3d96c4311701c8897a29668f77126c19ab
+DIST ceph-16.2.14.tar.gz 157243362 BLAKE2B 799132ebc815380b2040250915c82c5752983a23e2489e7c12e624b70a93b29c151cb1ab9670e43f2c89d75523655e57860dcdc797d455abc6c6ddc3c880c70c SHA512 397845f44d94e01ae49c5f4dabd75b8bf20c9ece9aeba85f4a5c12154335420cce390bfd94146be3bef763d44e47d15522a84b4f6cdc6bdde77982ac8bd79a54
 DIST ceph-17.2.6.tar.gz 168093221 BLAKE2B f79efce9bd7f485b43ae1b4da94a1d9fb3753003f34535e93c80e480ffeaaf054d371f75bca72402da5f9dd460aafa820bb2af550d213bdbcca74aa939180431 SHA512 dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0882e1c67007a780e1c25754e9bc6e760cc10f60ea1183263f8504ef2dbd9b
 DIST ceph-18.2.0.tar.gz 197353856 BLAKE2B 0f2217d9ec4105f72b7b48f7981c5cc098e8f6d46b029acaae1aa91d71486e7dc5726cad0763b5bb0f79d006e289a9f590c95f2494c17f2f09fb492c06db455a SHA512 fe6a3ca4227cc05b5effc33a02670c466583ec9e4c7c025241248223992254e6e6551d7db486d5ead36bf0ba922d54e0aabc2aaf456d4593679376ec88bd971a
 DIST ceph-xsimd-17.2.6.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-18.2.0.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-16.2.13-r2.ebuild 12608 BLAKE2B c845370d7b22863e46ed41dd0658687619e41bfb9b2518fe237ffc5160436f4b02981c4e82dd2e2493d286d549db280adfbc88cd8d4986beac8efd9351988f80 SHA512 f3b07d5f626ac35182295f7a89071f67eb6fb4fb9050ed76b5d8ed0b69b51340b70fe435ea283b358b5008f28b9d07aa13c3652fa3fc1d3ba8604b46f0e00322
-EBUILD ceph-17.2.6-r6.ebuild 13306 BLAKE2B 3483962ba0e195a6e2f5a394f6b0f3c27efb833539ecd0de5e55b6f49c44e7eb079d871461d2dd335391d705262d03406ece5718a775854752d8d0de24084f87 SHA512 e1fff25094bd96d0eb15d647b26ac4c68f457ff71d9cdee9b096c755306fd618bcb5323a353ff8c6199de8995c4c97adc8f05dc7cf2688a9d0c57e0bc2288e63
-EBUILD ceph-18.2.0.ebuild 13107 BLAKE2B d8447b5f4d69ecb0bc746465148ebb9f060a2ea71230cfd67c9c197fb4b9fa3ed6279ccac10704a8851dc305be5b4f052ed983c3b582f70b0c87b073f53673c8 SHA512 2f1b0971fbe230f53c1003af3f95f32521377e53ab3acad9aa7cf806a46e1fb7e862d4922db477de09e8954a95b92a8172a18b465c4b6d6bdb89beffba5915d1
+EBUILD ceph-16.2.14.ebuild 12718 BLAKE2B e39afaf4c18096fcd6e80963a2f9a866515da7eceb900261ad8da244692c2465ece9788c86d9873d25c76e8e1816dbb4a21396d890e2d1e5e597bdbcd4d02f2f SHA512 ba4f7160544a8e7989527bc8e3c4b0913a5c9b2c9fb12b614d06ead355a7f7ccf670a8725e87df3769269003cf531823408b25f3af5ed8cc8bae7876dcc60052
+EBUILD ceph-17.2.6-r7.ebuild 13425 BLAKE2B 443138493763aac8df33eef246e3909add70f036c5dad8a5c066a66d31deee462201a8c8a0d4f809d673beb6c5e9b9b6ce676cf1d58a95353023a8205dcdaf6c SHA512 f60dd71688100f162b00c9df9b8684cefeb3c1beaad94a89cd03086032216bbfcd054c7dc54972b6c750befcbf3aced7e6c58c12a92b9456c0caf674d1f539fa
+EBUILD ceph-18.2.0-r1.ebuild 13180 BLAKE2B cfb9c7ffc6e1d6c669535e85c819a36155ca5a598baf500d354ba6eeace86f7e3493006daae27c82c1cf0ef048c7d79e7aab46cb609955fab92d2b0d77d1c42b SHA512 a0bba2cdc8d80bc52f88c1857eab635f69d51f681d745bc3e4155999bf7b23460bdfadeb1bc8fa9b953771793219ff78ad86844e3715f14693eb4dd23bb02f23
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-16.2.13-r2.ebuild b/sys-cluster/ceph/ceph-16.2.14.ebuild
index dccc03e507a4..010b32a6ec27 100644
--- a/sys-cluster/ceph/ceph-16.2.13-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.14.ebuild
@@ -102,7 +102,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -211,6 +211,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.0-gcc12-header.patch"
 	"${FILESDIR}/ceph-16.2.10-flags.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
+	"${FILESDIR}/ceph-16.2.14-gcc13.patch"
 )
 
 check-reqs_export_vars() {
@@ -458,6 +459,9 @@ python_install() {
 	DESTDIR="${ED}" cmake_build VERBOSE=1 install
 	popd >/dev/null || die
 
+	python_scriptinto /usr/sbin
+	python_doscript src/cephadm/cephadm
+
 	python_optimize
 }
 
diff --git a/sys-cluster/ceph/ceph-17.2.6-r6.ebuild b/sys-cluster/ceph/ceph-17.2.6-r7.ebuild
index 2d7cf423fb87..2b0df75bacb3 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r6.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r7.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -468,6 +468,10 @@ src_install() {
 python_install() {
 	local CMAKE_USE_DIR="${S}"
 	DESTDIR="${ED}" cmake_build src/pybind/install
+	DESTDIR="${ED}" cmake_build src/cephadm/install
+
+	python_scriptinto /usr/sbin
+	python_doscript src/cephadm/cephadm
 
 	python_optimize
 }
diff --git a/sys-cluster/ceph/ceph-18.2.0.ebuild b/sys-cluster/ceph/ceph-18.2.0-r1.ebuild
index ca91f209f974..d77b75bd63ff 100644
--- a/sys-cluster/ceph/ceph-18.2.0.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.0-r1.ebuild
@@ -112,7 +112,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 	app-arch/cpio
 	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
+	<dev-python/cython-3[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/sphinx
 	dev-util/gperf
@@ -403,6 +403,7 @@ python_compile() {
 	ceph_src_configure
 
 	cmake_build src/pybind/CMakeFiles/cython_modules
+	cmake_build cephadm
 }
 
 src_install() {
@@ -466,6 +467,7 @@ src_install() {
 python_install() {
 	local CMAKE_USE_DIR="${S}"
 	DESTDIR="${ED}" cmake_build src/pybind/install
+	DESTDIR="${ED}" cmake_build src/cephadm/install
 
 	python_optimize
 }
diff --git a/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch b/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
new file mode 100644
index 000000000000..7f84a19706dc
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.14-gcc13.patch
@@ -0,0 +1,84 @@
+diff --git a/src/common/Cycles.h b/src/common/Cycles.h
+index 16e0aa67fc1..791be43469c 100644
+--- a/src/common/Cycles.h
++++ b/src/common/Cycles.h
+@@ -29,8 +29,9 @@
+  */
+ 
+ 
+-#ifndef CEPH_CYCLES_H
+-#define CEPH_CYCLES_H
++#pragma once
++
++#include <cstdint>
+ 
+ /**
+  * This class provides static methods that read the fine-grain CPU
+@@ -112,4 +113,3 @@ private:
+   }
+ };
+ 
+-#endif  // CEPH_CYCLES_H
+diff --git a/src/common/subsys_types.h b/src/common/subsys_types.h
+index 52171809b23..1a2ab796b6d 100644
+--- a/src/common/subsys_types.h
++++ b/src/common/subsys_types.h
+@@ -53,7 +53,7 @@ ceph_subsys_get_as_array() {
+ #undef DEFAULT_SUBSYS
+ }
+ 
+-constexpr static std::uint8_t
++constexpr static uint8_t
+ ceph_subsys_get_max_default_level(const std::size_t subidx) {
+   const auto item = ceph_subsys_get_as_array()[subidx];
+   return std::max(item.log_level, item.gather_level);
+diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
+index c0a8173596e..8d982879aa9 100644
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -9,6 +9,7 @@
+ 
+ #include <map>
+ #include <string>
++#include <cstdint>
+ 
+ namespace librbd {
+ 
+diff --git a/src/msg/async/crypto_onwire.h b/src/msg/async/crypto_onwire.h
+index 55f7550868f..2213c21d08d 100644
+--- a/src/msg/async/crypto_onwire.h
++++ b/src/msg/async/crypto_onwire.h
+@@ -95,7 +95,7 @@ public:
+   // Transmitter can append extra bytes of ciphertext at the -final step.
+   // This method return how much was added, and thus let client translate
+   // plaintext size into ciphertext size to grab from wire.
+-  virtual std::uint32_t get_extra_size_at_final() = 0;
++  virtual uint32_t get_extra_size_at_final() = 0;
+ 
+   // Instance of RxHandler must be reset before doing any decrypt-update
+   // step. This applies also to situation when decrypt-final was already
+diff --git a/src/test/librados/op_speed.cc b/src/test/librados/op_speed.cc
+index 90c7bdac571..9452da6dcc9 100644
+--- a/src/test/librados/op_speed.cc
++++ b/src/test/librados/op_speed.cc
+@@ -9,7 +9,7 @@ int main() {
+   for (int i = 0; i < to_create; ++i) {
+     librados::ObjectReadOperation op;
+     bufferlist bl;
+-    std::uint64_t sz;
++    uint64_t sz;
+     struct timespec tm;
+     std::map<std::string, ceph::buffer::list> xattrs;
+     std::map<std::string, ceph::buffer::list> omap;
+diff --git a/src/test/mon/test_log_rss_usage.cc b/src/test/mon/test_log_rss_usage.cc
+index f6e85f414c8..9769cabd884 100644
+--- a/src/test/mon/test_log_rss_usage.cc
++++ b/src/test/mon/test_log_rss_usage.cc
+@@ -5,6 +5,7 @@
+ #include <string>
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>