gentoo auto-resync : 18:04:2023 - 11:55:01

4 files changed, 99 insertions, 2 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 1d6b7fa214c8..8262191ba70e 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -29,6 +29,7 @@ AUX ceph-17.2.1-no-virtualenvs.patch 2780 BLAKE2B c1a752893800344a89321c76763268
 AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011a96d3d2562b2a5cecf25b1b20c65a0cb8e90c0972e6708088feeecd3f829d3fd614b41289bf7f0d2d6d357fe SHA512 65bbdeed0f835a5444bd468dce5e78bb43284f1cb96c3ecdbc63b267213b251c9ad18291f47cb4f604e6817e0bf4aab025b8b67c5c0877cd58f4981d4f65ccec
 AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c
 AUX ceph-17.2.5-boost-1.81.patch 1456 BLAKE2B 0dbff43d17f099242e1bf0d44f6c46c6175a4c9221fdd904a152cab8a1105cb94960b7519471d86a359c35a356a7c793de2a2ac7d3cb7880dcb044ad93ac44e4 SHA512 2dcb4d7e42ab71c97c601a7171075077966c6d3bfea1a0cc7676bcc03bb3bf5a4fca774bca571c908a6450098b48951ac5fc12f6121e015b6ac56deb5d514048
+AUX ceph-17.2.5-gcc13-deux.patch 2775 BLAKE2B 9ff9a80a87417206099490d47027df0d758aa5347a09840bc736a1a7a26f613226e681e2ee7a77d85ca9e97891ca79013ca2fd33500216abe5bcd2b4895b7226 SHA512 1ac1d35c77c608fe3bb0dd0e965817ff2d4eb4a02216f7eb41a20c505e5be9eccac729c3490a2466d3251f314442296cfb7b110c62828f584ddb5bab6116d02c
 AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517673c98b09c50a86467cd4478d11067a14ea57b10113e67e7772525cbee525e2855261322ff9e8cbd47a3268c5 SHA512 a0c720e624cef883c0360d043a4c3d49a4dfca2f0e4b3f73da9318615a3a5ff506baa133a140403b9a90fc87bddb6fbe58691f629f1cb689a21b732855343b44
 AUX ceph-17.2.5-link-boost-context.patch 492 BLAKE2B 828665f353890d92b586928421d6eee837a095c371e458d166cf6c6e9663b5ca9f71f74961c3db8731e042c31153f766457813fbcc50114631bb569a15f683f8 SHA512 b794685a7b6fc36267ea668232e12cd480b307f207dbbeafdbc874147925c24bc5497b7056106f2c1feea197835856aaaaeec399fe53f76fc274dc03c9d69a5d
 AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f
@@ -52,6 +53,6 @@ DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde9
 DIST ceph-xsimd-17.2.6.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 EBUILD ceph-16.2.10-r5.ebuild 12604 BLAKE2B d957a915facfb2ba4b3cbbdd6d5d73e89c670d4cdc1e103d253d76e7b65295915c7964e9587d1d1da1a9341f19309bb0bf0017f6e4ef554ab7b728ee3dd7cd75 SHA512 0e1d45f51ab863482cb5c91e78abd554fe9a4c5b676c15157fd1e6059ec7fdde23027b77e0e3c403766b895c804b2757fc11a525de7a8e123b6fe52787560190
 EBUILD ceph-16.2.12.ebuild 12513 BLAKE2B 2b4befa85baceca8add05ca29702642f11ed06176b762136f853ccbe5b33f660328768008c9070b1012fa3db3b8902b3b42e2819a4b7e5c11ae569720b1e476d SHA512 142dc905aac6dd3bd1d94a95d2ec8886554841630a872eb30c5c8ac7a5ccceca7197926113d01af328bed780c5ec6ce5f4ee6baf021ec553ac4e6ca16ccc4674
-EBUILD ceph-17.2.5-r3.ebuild 13089 BLAKE2B a20f6fac1f09520977c9af050ccaeabb20f9ee295a5c473f9eb205e445cb8c2e9b76a1b093fb08b04f973d992208c0b4a2ae2356802e81b3826e4e5552aa94d8 SHA512 91e617a48683190b43d42688f964246acde81987d37f583255a472d62435ebe7dde376131ba92fccb0135640f8b493902d3071cbed1c8f69138ce56ea183bb8f
-EBUILD ceph-17.2.6.ebuild 13050 BLAKE2B 149db8a961e1252cb4f5423cc4eb1ae231eb6d69199edfa21388eb3515877c97a04d86a5cde9065c23d86711b6592a99f3742c3d4f8fac352413a764689e0829 SHA512 b01adbc527c2993efecb069f6b5a51343822e2197ebf7be7df811348c508be25b405551098335b3ef4291c66d107700cd65aa656cf20fe58ec095df72dda3848
+EBUILD ceph-17.2.5-r3.ebuild 13133 BLAKE2B 68963ae7820992cd5f62e51f827df02339cba9ca03d00c6f64721d77050895fdb9192d7831636fd9c1bd7df5b561019bb85ce48b6dab8b38277e558a1ce3db22 SHA512 1f81b134b67008bbe3478c66b6973c802f127af3fe8b56d9734f5f76ad903e14db0f5d7a78964fb400cd22873953b070be1e225241650b95d758b60b9a563c8e
+EBUILD ceph-17.2.6.ebuild 13094 BLAKE2B 2bfc6f4a446dff96904aa6e428620d9c56ad3fc01c888d13c071a5885dde1017b616592c37871f234e16f35e18bfd44880cd605f6793a1b72cc265b9e8614882 SHA512 361c93262a12ab38b1f81b781473f65d683c62b458be379f10899575fd20342a7efd7e2f80831ff2925fc1593676f5897d06f5409a612e591bbb28c5a94a8720
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
index 2221ccb8e94e..29bdfc8cecf8 100644
--- a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
@@ -221,6 +221,7 @@ PATCHES=(
 	# https://bugs.gentoo.org/866165
 	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
 	"${FILESDIR}/ceph-17.2.5-gcc13.patch"
+	"${FILESDIR}/ceph-17.2.5-gcc13-deux.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
 	# https://bugs.gentoo.org/901403
 	"${FILESDIR}/ceph-17.2.5-link-boost-context.patch"
diff --git a/sys-cluster/ceph/ceph-17.2.6.ebuild b/sys-cluster/ceph/ceph-17.2.6.ebuild
index aa370edc1017..90bd3470f2ff 100644
--- a/sys-cluster/ceph/ceph-17.2.6.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6.ebuild
@@ -220,6 +220,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.4-cyclic-deps.patch"
 	# https://bugs.gentoo.org/866165
 	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+	"${FILESDIR}/ceph-17.2.5-gcc13-deux.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
 	# https://bugs.gentoo.org/901403
 	"${FILESDIR}/ceph-17.2.6-link-boost-context.patch"
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch
new file mode 100644
index 000000000000..1bfe7fdbf52f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/892501
+https://src.fedoraproject.org/rpms/ceph/c/945dc70d291321704f3218faa7c3efe70687ce27?branch=rawhide
+--- a/src/common/subsys_types.h
++++ b/src/common/subsys_types.h
+@@ -53,7 +53,7 @@
+ #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);
+--- a/src/msg/async/compression_onwire.h
++++ b/src/msg/async/compression_onwire.h
+@@ -44,7 +44,7 @@
+ 
+   class TxHandler final : private Handler {
+   public:
+-    TxHandler(CephContext* const cct, CompressorRef compressor, int mode, std::uint64_t min_size)
++    TxHandler(CephContext* const cct, CompressorRef compressor, int mode, uint64_t min_size)
+       : Handler(cct, compressor),
+ 	m_min_size(min_size),
+ 	m_mode(static_cast<Compressor::CompressionMode>(mode))
+@@ -97,7 +97,7 @@
+     static rxtx_t create_handler_pair(
+       CephContext* ctx,
+       const CompConnectionMeta& comp_meta,
+-      std::uint64_t compress_min_size);
++      uint64_t compress_min_size);
+   };
+ }
+ 
+--- a/src/msg/async/crypto_onwire.h
++++ b/src/msg/async/crypto_onwire.h
+@@ -95,7 +95,7 @@
+   // 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
+--- 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 @@
+   }
+ };
+ 
+-#endif  // CEPH_CYCLES_H
+--- a/src/test/librados/op_speed.cc
++++ b/src/test/librados/op_speed.cc
+@@ -9,7 +9,7 @@
+   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;
+--- 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>
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -9,6 +9,7 @@
+ 
+ #include <map>
+ #include <string>
++#include <cstdint>
+ 
+ namespace librbd {
+