ceph 18.2.6 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0017-gcc-12-omnibus.patch

@@ -1,13 +1,3 @@
---- ceph-16.2.7/src/include/buffer.h.orig	2022-01-17 12:17:19.193356237 -0500
-+++ ceph-16.2.7/src/include/buffer.h	2022-01-17 12:17:58.599639592 -0500
-@@ -38,6 +38,7 @@
- # include <sys/mman.h>
- #endif
- 
-+#include <memory>
- #include <iosfwd>
- #include <iomanip>
- #include <list>
 --- ceph-16.2.7/src/common/LogEntry.cc.orig	2022-01-17 13:52:10.799134159 -0500
 +++ ceph-16.2.7/src/common/LogEntry.cc	2022-01-17 13:52:47.244469274 -0500
 @@ -183,7 +183,7 @@
@@ -21,8 +11,8 @@
  
 --- ceph-16.2.7/src/test/librados/tier_cxx.cc.orig	2022-01-19 09:30:47.209459506 -0500
 +++ ceph-16.2.7/src/test/librados/tier_cxx.cc	2022-01-19 10:02:47.783240298 -0500
-@@ -114,7 +114,7 @@
- #include "rgw/rgw_common.h"
+@@ -120,7 +120,7 @@
+ }
  
  void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count,
 -			   std::string fp_algo = NULL)
@@ -30,7 +20,7 @@
  {
    bufferlist t;
    int size = foid.length();
-@@ -142,7 +142,7 @@
+@@ -148,7 +148,7 @@
    ASSERT_LE(count, refs.count());
  }
  
@@ -39,17 +29,6 @@
  {
    if (fp_algo == "sha1") {
      unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 1];
---- ceph-16.2.7/src/test/test_trans.cc.orig	2022-01-19 13:24:33.460008897 -0500
-+++ ceph-16.2.7/src/test/test_trans.cc	2022-01-19 13:24:58.211554005 -0500
-@@ -51,7 +51,7 @@
-   cout << "#dev " << filename << std::endl;
-   cout << "#mb " << mb << std::endl;
- 
--  ObjectStore *fs = new FileStore(cct.get(), filename, NULL);
-+  ObjectStore *fs = new FileStore(cct.get(), filename, "");
-   if (fs->mount() < 0) {
-     cout << "mount failed" << std::endl;
-     return -1;
 --- ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h.orig	2022-02-11 17:21:40.268627997 -0500
 +++ ceph-17.0.0-10335-gfd206722/src/s3select/include/s3select_functions.h	2022-02-11 17:21:57.155325437 -0500
 @@ -466,7 +466,7 @@

0018-src-rgw-store-dbstore-CMakeLists.txt.patch

@@ -1,24 +1,15 @@
---- ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt.orig	2022-03-01 08:19:04.974902872 -0500
-+++ ceph-17.1.0/src/rgw/store/dbstore/sqlite/CMakeLists.txt	2022-03-11 07:55:16.236261471 -0500
-@@ -12,5 +12,5 @@
- set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}")
- 
--add_library(sqlite_db ${sqlite_db_srcs})
-+add_library(sqlite_db STATIC ${sqlite_db_srcs})
- target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common)
---- ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt.orig	2022-02-28 14:11:49.987077811 -0500
-+++ ceph-17.1.0/src/rgw/store/dbstore/CMakeLists.txt	2022-03-11 08:40:13.409682698 -0500
-@@ -16,7 +16,7 @@
+--- ceph-18.0.0-3078-gc4847bf8/src/rgw/driver/dbstore/CMakeLists.txt.orig	2023-05-10 08:23:50.000000000 -0400
++++ ceph-18.0.0-3078-gc4847bf8/src/rgw/driver/dbstore/CMakeLists.txt	2023-05-11 08:21:13.794152904 -0400
+@@ -24,7 +24,7 @@
      dbstore_mgr.cc
      )
  
 -add_library(dbstore_lib ${dbstore_srcs})
 +add_library(dbstore_lib STATIC ${dbstore_srcs})
- target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/fmt/include")
- target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw")
- set(link_targets spawn)
-@@ -38,6 +38,7 @@
+ target_include_directories(dbstore_lib
+     PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw"
+     PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados"
+@@ -49,6 +49,7 @@
  
  # add pthread library
  set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} pthread)
@@ -26,12 +17,3 @@
  
  find_package(gtest QUIET)
  if(WITH_TESTS)
-@@ -47,7 +48,7 @@
- endif()
- 
- include_directories(${CMAKE_INCLUDE_DIR})
--add_library(dbstore ${dbstore_mgr_srcs})
-+add_library(dbstore STATIC ${dbstore_mgr_srcs})
- target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES})
- 
- # testing purpose

0019-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,43 +0,0 @@
---- ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake.orig	2022-06-03 08:45:32.341075140 -0400
-+++ ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake	2022-06-03 08:46:47.195775813 -0400
-@@ -10,8 +10,9 @@
-     check_cxx_source_compiles("
- #include <atomic>
- #include <cstdint>
-+#include <cstddef>
- 
--#if defined(__s390x__) || defined(__mips__)
-+#if defined(__SIZEOF_INT128__)
- // Boost needs 16-byte atomics for tagged pointers.
- // These are implemented via inline instructions on the platform
- // if 16-byte alignment can be proven, and are delegated to libatomic
-@@ -21,13 +22,27 @@
- // We specifically test access via an otherwise unknown pointer here
- // to ensure we get the most complex case.  If this access can be
- // done without libatomic, then all accesses can be done.
--bool atomic16(std::atomic<unsigned __int128> *ptr)
-+struct tagged_ptr {
-+  int* ptr;
-+  std::size_t tag;
-+};
-+
-+void atomic16(std::atomic<tagged_ptr> *ptr) __attribute__ ((used));
-+void atomic16(std::atomic<tagged_ptr> *ptr)
- {
--  return *ptr != 0;
-+  tagged_ptr p{nullptr, 1};
-+  ptr->store(p);
-+  tagged_ptr f = ptr->load();
-+  tagged_ptr new_tag{nullptr, 0};
-+  ptr->compare_exchange_strong(f, new_tag);
- }
- #endif
- 
- int main() {
-+#if defined(__SIZEOF_INT128__)
-+  std::atomic<tagged_ptr> ptr;
-+  atomic16(&ptr);
-+#endif
-   std::atomic<uint8_t> w1;
-   std::atomic<uint16_t> w2;
-   std::atomic<uint32_t> w4;

0022-mon-Replace-deprecated-use-of-format_to.patch

@@ -1,28 +0,0 @@
-From fff72cd14c58d06774cbd0274e6144b42448af03 Mon Sep 17 00:00:00 2001
-From: "Adam C. Emerson" <aemerson@redhat.com>
-Date: Mon, 7 Mar 2022 18:54:30 -0500
-Subject: [PATCH] mon: Replace deprecated use of format_to
-
-The non-deprecated version takes an explicit OutputIterator.
-
-Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
----
- src/mon/LogMonitor.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
-index 9103ddf7c5b..c196e8429fb 100644
---- a/src/mon/LogMonitor.cc
-+++ b/src/mon/LogMonitor.cc
-@@ -411,7 +411,7 @@ void LogMonitor::log_external(const LogEntry& le)
-     }
- 
-     if (fd >= 0) {
--      fmt::format_to(file_log_buffer, "{}\n", le);
-+      fmt::format_to(std::back_inserter(file_log_buffer), "{}\n", le);
-       int err = safe_write(fd, file_log_buffer.data(), file_log_buffer.size());
-       file_log_buffer.clear();
-       if (err < 0) {
--- 
-2.36.1
-

0023-src-s3select-include-s3select_parquet_intrf.h.patch

@@ -1,218 +0,0 @@
---- ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h.orig	2022-01-11 15:47:52.000000000 -0500
-+++ ceph-17.2.3/src/s3select/include/s3select_parquet_intrf.h	2022-08-22 10:26:06.738082924 -0400
-@@ -26,6 +26,14 @@
- #include "internal_file_decryptor.h"
- #include "encryption_internal.h"
- 
-+#if ARROW_VERSION_MAJOR < 9                                                           
-+#define _ARROW_FD fd_
-+#define _ARROW_FD_TYPE int
-+#else
-+#define _ARROW_FD fd_.fd()
-+#define _ARROW_FD_TYPE arrow::internal::FileDescriptor
-+#endif
-+
- /******************************************/
- /******************************************/
- class optional_yield;
-@@ -164,7 +172,7 @@
-   std::mutex lock_;
- 
-   // File descriptor
--  int fd_;
-+  _ARROW_FD_TYPE fd_;
- 
-   FileMode::type mode_;
- 
-@@ -202,7 +210,7 @@
-     mode_ = write_only ? FileMode::WRITE : FileMode::READWRITE;
- 
-     if (!truncate) {
--      ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(fd_));
-+      ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(_ARROW_FD));
-     } else {
-       size_ = 0;
-     }
-@@ -222,7 +230,11 @@
-     RETURN_NOT_OK(SetFileName(fd));
-     is_open_ = true;
-     mode_ = FileMode::WRITE;
-+    #if ARROW_VERSION_MAJOR < 9
-     fd_ = fd;
-+    #else
-+    fd_ = arrow::internal::FileDescriptor{fd};
-+    #endif
-     return Status::OK();
-   }
- 
-@@ -230,7 +242,7 @@
-     RETURN_NOT_OK(SetFileName(path));
- 
-     ARROW_ASSIGN_OR_RAISE(fd_, ::arrow::internal::FileOpenReadable(file_name_));
--    ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(fd_));
-+    ARROW_ASSIGN_OR_RAISE(size_, ::arrow::internal::FileGetSize(_ARROW_FD));
- 
-     is_open_ = true;
-     mode_ = FileMode::READ;
-@@ -242,7 +254,11 @@
-     RETURN_NOT_OK(SetFileName(fd));
-     is_open_ = true;
-     mode_ = FileMode::READ;
-+    #if ARROW_VERSION_MAJOR < 9
-     fd_ = fd;
-+    #else
-+    fd_ = arrow::internal::FileDescriptor{fd};
-+    #endif
-     return Status::OK();
-   }
- 
-@@ -258,9 +274,13 @@
-       // Even if closing fails, the fd will likely be closed (perhaps it's
-       // already closed).
-       is_open_ = false;
-+      #if ARROW_VERSION_MAJOR < 9
-       int fd = fd_;
-       fd_ = -1;
-       RETURN_NOT_OK(::arrow::internal::FileClose(fd));
-+      #else
-+      RETURN_NOT_OK(fd_.Close());
-+      #endif
-     }
-     return Status::OK();
-   }
-@@ -268,7 +288,7 @@
-   Result<int64_t> Read(int64_t nbytes, void* out) override {
-     RETURN_NOT_OK(CheckClosed());
-     RETURN_NOT_OK(CheckPositioned());
--    return ::arrow::internal::FileRead(fd_, reinterpret_cast<uint8_t*>(out), nbytes);
-+    return ::arrow::internal::FileRead(_ARROW_FD, reinterpret_cast<uint8_t*>(out), nbytes);
-   }
- 
-   Result<int64_t> ReadAt(int64_t position, int64_t nbytes, void* out) override {
-@@ -277,7 +297,7 @@
-     // ReadAt() leaves the file position undefined, so require that we seek
-     // before calling Read() or Write().
-     need_seeking_.store(true);
--    return ::arrow::internal::FileReadAt(fd_, reinterpret_cast<uint8_t*>(out), position,
-+    return ::arrow::internal::FileReadAt(_ARROW_FD, reinterpret_cast<uint8_t*>(out), position,
-                                          nbytes);
-   }
- 
-@@ -286,7 +306,7 @@
-     if (pos < 0) {
-       return Status::Invalid("Invalid position");
-     }
--    Status st = ::arrow::internal::FileSeek(fd_, pos);
-+    Status st = ::arrow::internal::FileSeek(_ARROW_FD, pos);
-     if (st.ok()) {
-       need_seeking_.store(false);
-     }
-@@ -295,7 +315,7 @@
- 
-   Result<int64_t> Tell() const override {
-     RETURN_NOT_OK(CheckClosed());
--    return ::arrow::internal::FileTell(fd_);
-+    return ::arrow::internal::FileTell(_ARROW_FD);
-   }
- 
-   Status Write(const void* data, int64_t length) override {
-@@ -306,11 +326,11 @@
-     if (length < 0) {
-       return Status::IOError("Length must be non-negative");
-     }
--    return ::arrow::internal::FileWrite(fd_, reinterpret_cast<const uint8_t*>(data),
-+    return ::arrow::internal::FileWrite(_ARROW_FD, reinterpret_cast<const uint8_t*>(data),
-                                         length);
-   }
- 
--  int fd() const override { return fd_; }
-+  int fd() const override { return _ARROW_FD; }
- 
-   bool is_open() const override { return is_open_; }
- 
-@@ -345,7 +365,7 @@
-   std::mutex lock_;
- 
-   // File descriptor
--  int fd_;
-+  _ARROW_FD_TYPE fd_;
- 
-   FileMode::type mode_;
- 
-@@ -411,7 +431,11 @@
-       // already closed).
-       is_open_ = false;
-       //int fd = fd_;
-+      #if ARROW_VERSION_MAJOR < 9
-       fd_ = -1;
-+      #else
-+      fd_.Close();
-+      #endif
-       //RETURN_NOT_OK(::arrow::internal::FileClose(fd));
-     }
-     return Status::OK();
-@@ -421,7 +445,7 @@
-     NOT_IMPLEMENT;
-     RETURN_NOT_OK(CheckClosed());
-     RETURN_NOT_OK(CheckPositioned());
--    return ::arrow::internal::FileRead(fd_, reinterpret_cast<uint8_t*>(out), nbytes);
-+    return ::arrow::internal::FileRead(_ARROW_FD, reinterpret_cast<uint8_t*>(out), nbytes);
-   }
- 
-   Result<int64_t> ReadAt(int64_t position, int64_t nbytes, void* out) {
-@@ -443,7 +467,7 @@
-     return Status::OK();
-   }
- 
--  int fd() const { return fd_; }
-+  int fd() const { return _ARROW_FD; }
- 
-   bool is_open() const { return is_open_; }
- 
-@@ -467,7 +491,7 @@
-   std::mutex lock_;
- 
-   // File descriptor
--  int fd_;
-+  _ARROW_FD_TYPE fd_;
- 
-   FileMode::type mode_;
- 
-@@ -609,7 +633,7 @@
-     for (const auto& range : ranges) {
-       RETURN_NOT_OK(internal::ValidateRange(range.offset, range.length));
- #if defined(POSIX_FADV_WILLNEED)
--      if (posix_fadvise(fd_, range.offset, range.length, POSIX_FADV_WILLNEED)) {
-+      if (posix_fadvise(_ARROW_FD, range.offset, range.length, POSIX_FADV_WILLNEED)) {
-         return IOErrorFromErrno(errno, "posix_fadvise failed");
-       }
- #elif defined(F_RDADVISE)  // macOS, BSD?
-@@ -617,7 +641,7 @@
-         off_t ra_offset;
-         int ra_count;
-       } radvisory{range.offset, static_cast<int>(range.length)};
--      if (radvisory.ra_count > 0 && fcntl(fd_, F_RDADVISE, &radvisory) == -1) {
-+      if (radvisory.ra_count > 0 && fcntl(_ARROW_FD, F_RDADVISE, &radvisory) == -1) {
-         return IOErrorFromErrno(errno, "fcntl(fd, F_RDADVISE, ...) failed");
-       }
- #endif
-@@ -970,6 +994,9 @@
-       CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_,
-                         static_cast<int16_t>(i), meta_decryptor, data_decryptor);
-       return PageReader::Open(stream, col->num_values(), col->compression(),
-+      #if ARROW_VERSION_MAJOR > 8
-+                              false,
-+      #endif
-                               properties_.memory_pool(), &ctx);
-     }
- 
-@@ -985,6 +1012,9 @@
-     CryptoContext ctx(col->has_dictionary_page(), row_group_ordinal_,
-                       static_cast<int16_t>(i), meta_decryptor, data_decryptor);
-     return PageReader::Open(stream, col->num_values(), col->compression(),
-+    #if ARROW_VERSION_MAJOR > 8
-+                            false,
-+    #endif
-                             properties_.memory_pool(), &ctx);
-   }
- 

0024-gcc-13.patch

@@ -0,0 +1,42 @@
+--- ceph-18.1.2/src/common/subsys_types.h.orig	2023-06-27 15:59:59.000000000 -0400
++++ ceph-18.1.2/src/common/subsys_types.h	2023-07-04 19:36:55.941238973 -0400
+@@ -54,7 +54,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);
+--- ceph-18.1.2/src/msg/async/crypto_onwire.h.orig	2023-06-27 15:59:59.000000000 -0400
++++ ceph-18.1.2/src/msg/async/crypto_onwire.h	2023-07-04 19:36:55.957238704 -0400
+@@ -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
+--- ceph-18.1.2/src/rocksdb/table/block_based/data_block_hash_index.h.orig	2023-05-24 15:55:23.000000000 -0400
++++ ceph-18.1.2/src/rocksdb/table/block_based/data_block_hash_index.h	2023-07-04 19:36:55.971238469 -0400
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/slice.h"
+ 
+--- ceph-18.1.2/src/rocksdb/util/string_util.h.orig	2023-05-24 15:55:23.000000000 -0400
++++ ceph-18.1.2/src/rocksdb/util/string_util.h	2023-07-04 19:36:55.991238133 -0400
+@@ -11,6 +11,7 @@
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/rocksdb_namespace.h"
+ 

0025-src-osd-scrubber-scrub_backend.h.patch

@@ -0,0 +1,32 @@
+--- ceph-18.0.0-1810-g728e8ac0/src/osd/scrubber/scrub_backend.h.orig	2023-01-18 16:35:03.398700052 -0500
++++ ceph-18.0.0-1810-g728e8ac0/src/osd/scrubber/scrub_backend.h	2023-01-18 16:37:55.882677965 -0500
+@@ -183,20 +183,20 @@
+       // note: 'if' chain, as hard to consistently (on all compilers) avoid some
+       // warnings for a switch plus multiple return paths
+       if (as_auth.possible_auth == shard_as_auth_t::usable_t::not_usable) {
+-        return format_to(ctx.out(),
+-                         "{{shard-not-usable:{}}}",
+-                         as_auth.error_text);
++        return fmt::format_to(ctx.out(),
++                              "{{shard-not-usable:{}}}",
++                              as_auth.error_text.c_str());
+       }
+       if (as_auth.possible_auth == shard_as_auth_t::usable_t::not_found) {
+-        return format_to(ctx.out(), "{{shard-not-found}}");
++        return fmt::format_to(ctx.out(), "{{shard-not-found}}");
+       }
+-      return format_to(ctx.out(),
+-                       "{{shard-usable: soid:{} {{txt:{}}} }}",
+-                       as_auth.oi.soid,
+-                       as_auth.error_text);
++      return fmt::format_to(ctx.out(),
++                            "{{shard-usable: soid:{} {{txt:{}}} }}",
++                            as_auth.oi.soid,
++                            as_auth.error_text.c_str());
+ 
+     } else {
+-      return format_to(
++      return fmt::format_to(
+         ctx.out(),
+         "usable:{} soid:{} {{txt:{}}}",
+         (as_auth.possible_auth == shard_as_auth_t::usable_t::usable) ? "yes"

0026-src-osd-scrubber-scrub_backend.cc.patch

@@ -0,0 +1,199 @@
+--- ceph-18.0.0-2148-g9754cafc/src/osd/scrubber/scrub_backend.cc.orig	2023-02-08 16:01:53.800709761 -0500
++++ ceph-18.0.0-2148-g9754cafc/src/osd/scrubber/scrub_backend.cc	2023-02-11 05:06:14.954254050 -0500
+@@ -507,11 +507,11 @@
+     }
+   }
+ 
+-  dout(10) << fmt::format("{}: selecting osd {} for obj {} with oi {}",
++  dout(10) << fmt::format("{}: selecting osd {} for obj {} with oi {:p}",
+                           __func__,
+                           ret_auth.auth_shard,
+                           ho,
+-                          ret_auth.auth_oi)
++                          (void*)&ret_auth.auth_oi)
+            << dendl;
+ 
+   return ret_auth;
+@@ -1171,23 +1171,23 @@
+ 
+   if (auth.digest_present && candidate.digest_present &&
+       auth.digest != candidate.digest) {
+-    format_to(std::back_inserter(out),
+-              "data_digest {:#x} != data_digest {:#x} from shard {}",
+-              candidate.digest,
+-              auth.digest,
+-              auth_shard);
++    fmt::format_to(std::back_inserter(out),
++                   "data_digest {:#x} != data_digest {:#x} from shard {}",
++                   candidate.digest,
++                   auth.digest,
++                   auth_shard);
+     error = true;
+     obj_result.set_data_digest_mismatch();
+   }
+ 
+   if (auth.omap_digest_present && candidate.omap_digest_present &&
+       auth.omap_digest != candidate.omap_digest) {
+-    format_to(std::back_inserter(out),
+-              "{}omap_digest {:#x} != omap_digest {:#x} from shard {}",
+-              sep(error),
+-              candidate.omap_digest,
+-              auth.omap_digest,
+-              auth_shard);
++    fmt::format_to(std::back_inserter(out),
++                   "{}omap_digest {:#x} != omap_digest {:#x} from shard {}",
++                   sep(error),
++                   candidate.omap_digest,
++                   auth.omap_digest,
++                   auth_shard);
+     obj_result.set_omap_digest_mismatch();
+   }
+ 
+@@ -1195,24 +1195,24 @@
+   if (m_is_replicated) {
+     if (auth_oi.is_data_digest() && candidate.digest_present &&
+         auth_oi.data_digest != candidate.digest) {
+-      format_to(std::back_inserter(out),
+-                "{}data_digest {:#x} != data_digest {:#x} from auth oi {}",
+-                sep(error),
+-                candidate.digest,
+-                auth_oi.data_digest,
+-                auth_oi);
++      fmt::format_to(std::back_inserter(out),
++                     "{}data_digest {:#x} != data_digest {:#x} from auth oi {:p}",
++                     sep(error),
++                     candidate.digest,
++                     auth_oi.data_digest,
++                     (void*)&auth_oi);
+       shard_result.set_data_digest_mismatch_info();
+     }
+ 
+     // for replicated:
+     if (auth_oi.is_omap_digest() && candidate.omap_digest_present &&
+         auth_oi.omap_digest != candidate.omap_digest) {
+-      format_to(std::back_inserter(out),
+-                "{}omap_digest {:#x} != omap_digest {:#x} from auth oi {}",
+-                sep(error),
+-                candidate.omap_digest,
+-                auth_oi.omap_digest,
+-                auth_oi);
++      fmt::format_to(std::back_inserter(out),
++                     "{}omap_digest {:#x} != omap_digest {:#x} from auth oi {:p}",
++                     sep(error),
++                     candidate.omap_digest,
++                     auth_oi.omap_digest,
++                     (void*)&auth_oi);
+       shard_result.set_omap_digest_mismatch_info();
+     }
+   }
+@@ -1241,7 +1241,7 @@
+     auth_bl.push_back(auth_attr->second);
+ 
+     if (!can_bl.contents_equal(auth_bl)) {
+-      format_to(std::back_inserter(out), "{}object info inconsistent ", sep(error));
++      fmt::format_to(std::back_inserter(out), "{}object info inconsistent ", sep(error));
+       obj_result.set_object_info_inconsistency();
+     }
+   }
+@@ -1261,7 +1261,7 @@
+       auth_bl.push_back(auth_attr->second);
+ 
+       if (!can_bl.contents_equal(auth_bl)) {
+-        format_to(std::back_inserter(out), "{}snapset inconsistent ", sep(error));
++        fmt::format_to(std::back_inserter(out), "{}snapset inconsistent ", sep(error));
+         obj_result.set_snapset_inconsistency();
+       }
+     }
+@@ -1284,7 +1284,7 @@
+       auth_bl.push_back(auth_hi->second);
+ 
+       if (!can_bl.contents_equal(auth_bl)) {
+-        format_to(std::back_inserter(out), "{}hinfo inconsistent ", sep(error));
++        fmt::format_to(std::back_inserter(out), "{}hinfo inconsistent ", sep(error));
+         obj_result.set_hinfo_inconsistency();
+       }
+     }
+@@ -1296,22 +1296,22 @@
+ 
+   uint64_t oi_size = logical_to_ondisk_size(auth_oi.size);
+   if (oi_size != candidate.size) {
+-    format_to(std::back_inserter(out),
+-              "{}size {} != size {} from auth oi {}",
+-              sep(error),
+-              candidate.size,
+-              oi_size,
+-              auth_oi);
++    fmt::format_to(std::back_inserter(out),
++                   "{}size {} != size {} from auth oi {:p}",
++                   sep(error),
++                   candidate.size,
++                   oi_size,
++                   (void*)&auth_oi);
+     shard_result.set_size_mismatch_info();
+   }
+ 
+   if (auth.size != candidate.size) {
+-    format_to(std::back_inserter(out),
+-              "{}size {} != size {} from shard {}",
+-              sep(error),
+-              candidate.size,
+-              auth.size,
+-              auth_shard);
++    fmt::format_to(std::back_inserter(out),
++                   "{}size {} != size {} from shard {}",
++                   sep(error),
++                   candidate.size,
++                   auth.size,
++                   auth_shard);
+     obj_result.set_size_mismatch();
+   }
+ 
+@@ -1320,11 +1320,11 @@
+   if (candidate.size > m_conf->osd_max_object_size &&
+       !obj_result.has_size_too_large()) {
+ 
+-    format_to(std::back_inserter(out),
+-              "{}size {} > {} is too large",
+-              sep(error),
+-              candidate.size,
+-              m_conf->osd_max_object_size);
++    fmt::format_to(std::back_inserter(out),
++                   "{}size {} > {} is too large",
++                   sep(error),
++                   candidate.size,
++                   m_conf->osd_max_object_size);
+     obj_result.set_size_too_large();
+   }
+ 
+@@ -1340,10 +1340,10 @@
+ 
+     auto cand = candidate.attrs.find(k);
+     if (cand == candidate.attrs.end()) {
+-      format_to(std::back_inserter(out), "{}attr name mismatch '{}'", sep(error), k);
++      fmt::format_to(std::back_inserter(out), "{}attr name mismatch '{}'", sep(error), k);
+       obj_result.set_attr_name_mismatch();
+     } else if (cand->second.cmp(v)) {
+-      format_to(std::back_inserter(out), "{}attr value mismatch '{}'", sep(error), k);
++      fmt::format_to(std::back_inserter(out), "{}attr value mismatch '{}'", sep(error), k);
+       obj_result.set_attr_value_mismatch();
+     }
+   }
+@@ -1356,7 +1356,7 @@
+ 
+     auto in_auth = auth.attrs.find(k);
+     if (in_auth == auth.attrs.end()) {
+-      format_to(std::back_inserter(out), "{}attr name mismatch '{}'", sep(error), k);
++      fmt::format_to(std::back_inserter(out), "{}attr name mismatch '{}'", sep(error), k);
+       obj_result.set_attr_name_mismatch();
+     }
+   }
+@@ -1823,8 +1823,7 @@
+   SnapMapReaderI& snaps_getter)
+ {
+   using result_t = Scrub::SnapMapReaderI::result_t;
+-  dout(15) << fmt::format("{}: obj:{} snapset:{}", __func__, hoid, snapset)
+-	   << dendl;
++  // dout(15) << fmt::format("{}: obj:{} snapset:{}", __func__, hoid, snapset) << dendl;
+ 
+   auto p = snapset.clone_snaps.find(hoid.snap);
+   if (p == snapset.clone_snaps.end()) {

0027-src-kv-rocksdb_cache-ShardedCache.h.patch

@@ -0,0 +1,151 @@
+--- ceph-17.2.6/src/kv/rocksdb_cache/ShardedCache.h.orig	2023-04-05 11:09:51.000000000 -0400
++++ ceph-17.2.6/src/kv/rocksdb_cache/ShardedCache.h	2023-04-21 16:22:26.665067333 -0400
+@@ -15,7 +15,7 @@
+ #include <mutex>
+ 
+ #include "rocksdb/version.h"
+-#include "rocksdb/cache.h"
++#include "rocksdb/advanced_cache.h"
+ #include "include/ceph_hash.h"
+ #include "common/PriorityCache.h"
+ //#include "hash.h"
+@@ -26,7 +26,8 @@
+ 
+ namespace rocksdb_cache {
+ 
+-using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
++// using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
++using DeleterFn = void (*)(rocksdb::Cache::ObjectPtr obj, rocksdb::MemoryAllocator* allocator);
+ 
+ // Single cache shard interface.
+ class CacheShard {
+@@ -34,11 +35,19 @@
+   CacheShard() = default;
+   virtual ~CacheShard() = default;
+ 
+-  virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+-                                 size_t charge,
+-                                 DeleterFn deleter,
+-                                 rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) = 0;
+-  virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) = 0;
++  virtual rocksdb::Status Insert(const rocksdb::Slice& key,
++                        rockdb::ObjectPtr obj,
++                        const rocksdb::CacheItemHelper* helper,
++                        size_t charge,
++                        rocksdb:Handle** handle = nullptr,
++                        Rocksdb::Priority priority = Rocksdb::Priority::LOW)
++  virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key,
++                         const rocksdb::CacheItemHelper* helper = nullptr,
++                         rocksdb::CreateContext* create_context = nullptr,
++                         rocksdb::Priority priority = rocksdb::Priority::LOW,
++                         bool wait = true,
++                         rocksdb::Statistics* stats = nullptr);
++
+   virtual bool Ref(rocksdb::Cache::Handle* handle) = 0;
+   virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) = 0;
+   virtual void Erase(const rocksdb::Slice& key, uint32_t hash) = 0;
+@@ -68,8 +77,8 @@
+   virtual const char* Name() const override = 0;
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
+                                  DeleterFn,
+-                                 rocksdb::Cache::Handle** handle, Priority priority) override;
+-  virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
++                                 rocksdb::Cache::Handle** handle, Priority priority);
++  virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats);
+   virtual bool Ref(rocksdb::Cache::Handle* handle) override;
+   virtual bool Release(rocksdb::Cache::Handle* handle, bool force_erase = false) override;
+   virtual void* Value(Handle* handle) override = 0;
+@@ -84,14 +93,17 @@
+   virtual size_t GetPinnedUsage() const override;
+   virtual size_t GetCharge(Handle* handle) const = 0;
+ #if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
+-  virtual DeleterFn GetDeleter(Handle* handle) const override;
++  virtual DeleterFn GetDeleter(Handle* handle) const;
+ #endif
+   virtual void DisownData() override = 0;
+ #if (ROCKSDB_MAJOR >= 7 || (ROCKSDB_MAJOR == 6 && ROCKSDB_MINOR >= 22))
++  virtual const rocksdb::CacheItemHelper* GetCacheItemHelper(rocksdb::Cache::Handle* handle) const;
+   virtual void ApplyToAllEntries(
+-      const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
+-                               DeleterFn deleter)>& callback,
+-      const ApplyToAllEntriesOptions& opts) override;
++     const std::function<void(const rocksdb::Slice& key,
++                              rocksdb::Cache::ObjectPtr obj,
++                              size_t charge,
++                               const rocksdb::CacheItemHelper* helper)>& callback,
++      const rocksdb::ApplyToAllEntriesOptions& opts); 
+ #else
+   virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+                                       bool thread_safe) override;
+--- ceph-17.2.6/src/kv/RocksDBStore.cc.orig	2023-04-05 11:09:51.000000000 -0400
++++ ceph-17.2.6/src/kv/RocksDBStore.cc	2023-04-20 16:19:29.280669881 -0400
+@@ -903,6 +903,19 @@
+ // base_name - name of column without shard suffix: "-"+number
+ // options - additional options to apply
+ // cf_opt - column family options to update
++
++rocksdb::Status GetColumnFamilyOptionsFromMap(
++    const rocksdb::ColumnFamilyOptions& base_options,
++    const std::unordered_map<std::string, std::string>& opts_map,
++    rocksdb::ColumnFamilyOptions* new_options, bool input_strings_escaped,
++    bool ignore_unknown_options) {
++  rocksdb::ConfigOptions config_options;
++  config_options.ignore_unknown_options = ignore_unknown_options;
++  config_options.input_strings_escaped = input_strings_escaped;
++  return rocksdb::GetColumnFamilyOptionsFromMap(config_options, base_options, opts_map,
++                                       new_options);
++}
++
+ int RocksDBStore::update_column_family_options(const std::string& base_name,
+ 					       const std::string& more_options,
+ 					       rocksdb::ColumnFamilyOptions* cf_opt)
+@@ -916,7 +929,7 @@
+ 	    << " options=" << more_options << dendl;
+     return r;
+   }
+-  status = rocksdb::GetColumnFamilyOptionsFromMap(*cf_opt, options_map, cf_opt);
++  status = GetColumnFamilyOptionsFromMap(*cf_opt, options_map, cf_opt, false, false);
+   if (!status.ok()) {
+     dout(5) << __func__ << " invalid column family optionsp; column family="
+ 	    << base_name << " options=" << more_options << dendl;
+@@ -937,6 +950,20 @@
+   return 0;
+ }
+ 
++rocksdb::Status GetBlockBasedTableOptionsFromMap(
++    const rocksdb::BlockBasedTableOptions& table_options,
++    const std::unordered_map<std::string, std::string>& opts_map,
++    rocksdb::BlockBasedTableOptions* new_table_options, bool input_strings_escaped,
++    bool ignore_unknown_options) {
++  rocksdb::ConfigOptions config_options;
++  config_options.input_strings_escaped = input_strings_escaped;
++  config_options.ignore_unknown_options = ignore_unknown_options;
++  config_options.invoke_prepare_options = false;
++
++  return rocksdb::GetBlockBasedTableOptionsFromMap(config_options, table_options,
++                                          opts_map, new_table_options);
++}
++
+ int RocksDBStore::apply_block_cache_options(const std::string& column_name,
+ 					    const std::string& block_cache_opt,
+ 					    rocksdb::ColumnFamilyOptions* cf_opt)
+@@ -981,7 +1008,7 @@
+   }
+ 
+   rocksdb::BlockBasedTableOptions column_bbt_opts;
+-  status = GetBlockBasedTableOptionsFromMap(bbt_opts, cache_options_map, &column_bbt_opts);
++  status = GetBlockBasedTableOptionsFromMap(bbt_opts, cache_options_map, &column_bbt_opts, false, false);
+   if (!status.ok()) {
+     dout(5) << __func__ << " invalid block cache options; column=" << column_name
+ 	    << " options=" << block_cache_opt << dendl;
+--- ceph-17.2.6/src/kv/rocksdb_cache/BinnedLRUCache.h.orig	2023-04-21 10:11:00.180387609 -0400
++++ ceph-17.2.6/src/kv/rocksdb_cache/BinnedLRUCache.h	2023-04-21 10:17:15.527816193 -0400
+@@ -121,7 +121,7 @@
+   void Free() {
+     ceph_assert((refs == 1 && InCache()) || (refs == 0 && !InCache()));
+     if (deleter) {
+-      (*deleter)(key(), value);
++      (*deleter)(this, nullptr);
+     }
+     delete[] key_data;
+     delete this;

0029-src-rgw-rgw_amqp.cc.patch

@@ -0,0 +1,17 @@
+--- ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_amqp.cc.orig	2023-03-14 18:22:35.636864260 -0400
++++ ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_amqp.cc	2023-03-14 18:24:36.362756771 -0400
+@@ -2,10 +2,10 @@
+ // vim: ts=8 sw=2 smarttab ft=cpp
+ 
+ #include "rgw_amqp.h"
+-#include <amqp.h>
+-#include <amqp_ssl_socket.h>
+-#include <amqp_tcp_socket.h>
+-#include <amqp_framing.h>
++#include <rabbitmq-c/amqp.h>
++#include <rabbitmq-c/ssl_socket.h>
++#include <rabbitmq-c/tcp_socket.h>
++#include <rabbitmq-c/framing.h>
+ #include "include/ceph_assert.h"
+ #include <sstream>
+ #include <cstring>

0030-src-rgw-rgw_asio_client.cc.patch

@@ -0,0 +1,61 @@
+--- ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_asio_client.cc.orig	2023-03-14 18:46:02.037195570 -0400
++++ ceph-18.0.0-2726-g7cea3740/src/rgw/rgw_asio_client.cc	2023-03-14 18:55:14.446438244 -0400
+@@ -39,11 +39,13 @@
+     const auto& value = header->value();
+ 
+     if (field == beast::http::field::content_length) {
+-      env.set("CONTENT_LENGTH", value.to_string());
++      std::string scratch{value.data(), value.size()};
++      env.set("CONTENT_LENGTH", scratch.c_str());
+       continue;
+     }
+     if (field == beast::http::field::content_type) {
+-      env.set("CONTENT_TYPE", value.to_string());
++      std::string scratch{value.data(), value.size()};
++      env.set("CONTENT_TYPE", scratch.c_str());
+       continue;
+     }
+ 
+@@ -62,26 +64,37 @@
+     }
+     *dest = '\0';
+ 
+-    env.set(buf, value.to_string());
++    std::string scratch{value.data(), value.size()};
++    env.set(buf, scratch.c_str());
+   }
+ 
+   int major = request.version() / 10;
+   int minor = request.version() % 10;
+   env.set("HTTP_VERSION", std::to_string(major) + '.' + std::to_string(minor));
+ 
+-  env.set("REQUEST_METHOD", request.method_string().to_string());
++  {
++    std::string scratch {request.method_string().data(),request.method_string().size()};
++    env.set("REQUEST_METHOD", scratch.c_str());
++  }
+ 
+   // split uri from query
+   auto uri = request.target();
+   auto pos = uri.find('?');
+   if (pos != uri.npos) {
+     auto query = uri.substr(pos + 1);
+-    env.set("QUERY_STRING", query.to_string());
++    std::string scratch{query.data(), query.size()};
++    env.set("QUERY_STRING", scratch.c_str());
+     uri = uri.substr(0, pos);
+   }
+-  env.set("SCRIPT_URI", uri.to_string());
++  {
++    std::string scratch {uri.data(), uri.size()};
++    env.set("SCRIPT_URI", scratch.c_str());
++  }
+ 
+-  env.set("REQUEST_URI", request.target().to_string());
++  {
++    std::string scratch {request.target().data(), request.target().size()};
++    env.set("REQUEST_URI", scratch.c_str());
++  }
+ 
+   char port_buf[16];
+   snprintf(port_buf, sizeof(port_buf), "%d", local_endpoint.port());

0032-cmake-modules-BuildBoost.cmake.patch

@@ -0,0 +1,24 @@
+--- ceph-18.0.0-2950-g1c931bc4/cmake/modules/BuildBoost.cmake.orig	2023-04-28 18:30:19.133064577 -0400
++++ ceph-18.0.0-2950-g1c931bc4/cmake/modules/BuildBoost.cmake	2023-04-28 18:31:55.290354383 -0400
+@@ -104,12 +104,21 @@
+   set(user_config ${CMAKE_BINARY_DIR}/user-config.jam)
+   # edit the user-config.jam so b2 will be able to use the specified
+   # toolset and python
++if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
++  file(WRITE ${user_config}
++    "using ${toolset}"
++    " : "
++    " : ${CMAKE_CXX_COMPILER}"
++    " : <compileflags>-fPIC <compileflags>-w <compileflags>-fcf-protection <compileflags>-Wno-everything" 
++    " ;\n")
++else()
+   file(WRITE ${user_config}
+     "using ${toolset}"
+     " : "
+     " : ${CMAKE_CXX_COMPILER}"
+     " : <compileflags>-fPIC <compileflags>-w <compileflags>-Wno-everything"
+     " ;\n")
++endif()
+   if(with_python_version)
+     find_package(Python3 ${with_python_version} QUIET REQUIRED
+       COMPONENTS Development)

0033-boost-asm.patch

@@ -0,0 +1,61 @@
+--- ceph-17.2.6/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.009605033 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S	2023-04-30 14:28:32.239465067 -0400
+@@ -80,3 +80,18 @@
+ 
+ /* Mark that we don't need executable stack. */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++
+--- ceph-17.2.6/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.008605050 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S	2023-04-30 14:27:50.145210847 -0400
+@@ -89,3 +89,17 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+--- ceph-17.2.6/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.009605033 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S	2023-04-30 14:29:30.402434597 -0400
+@@ -92,3 +92,17 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

0034-src-pybind-rbd-rbd.pyx.patch

@@ -0,0 +1,24 @@
+--- ceph-18.1.2/src/pybind/rbd/rbd.pyx.orig	2023-07-21 13:30:08.156825317 -0400
++++ ceph-18.1.2/src/pybind/rbd/rbd.pyx	2023-07-24 09:09:27.930137117 -0400
+@@ -371,10 +371,10 @@
+     cdef rados_ioctx_t convert_ioctx(rados.Ioctx ioctx) except? NULL:
+         return <rados_ioctx_t>ioctx.io
+ 
+-cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) with gil:
++cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept with gil:
+     return (<object>ptr)(offset, total)
+ 
+-cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr):
++cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept:
+     return 0
+ 
+ def cstr(val, name, encoding="utf-8", opt=False):
+@@ -426,7 +426,7 @@
+ 
+ cdef class Completion
+ 
+-cdef void __aio_complete_cb(rbd_completion_t completion, void *args) with gil:
++cdef void __aio_complete_cb(rbd_completion_t completion, void *args) noexcept with gil:
+     """
+     Callback to oncomplete() for asynchronous operations
+     """

0035-src-CMakeLists.txt.patch

@@ -0,0 +1,18 @@
+--- ceph/src/CMakeLists.txt.orig	2023-11-01 11:53:53.618167190 -0400
++++ ceph/src/CMakeLists.txt	2023-11-01 13:52:51.292643490 -0400
+@@ -625,6 +625,7 @@
+ add_subdirectory(perfglue)
+ 
+ add_library(rados_snap_set_diff_obj OBJECT librados/snap_set_diff.cc)
++add_dependencies(rados_snap_set_diff_obj legacy-option-headers)
+ 
+ option(WITH_LIBRADOSSTRIPER "build with libradosstriper support" ON)
+ 
+@@ -881,6 +882,7 @@
+     add_library(krbd STATIC krbd.cc
+       $<TARGET_OBJECTS:parse_secret_objs>)
+     target_link_libraries(krbd keyutils::keyutils)
++    add_dependencies(krbd legacy-option-headers)
+   endif()
+   add_subdirectory(librbd)
+   if(WITH_FUSE)

0040-src-include-rados-rgw_file.h.patch

@@ -0,0 +1,11 @@
+--- ceph-18.2.4/src/include/rados/rgw_file.h.orig	2024-09-23 12:05:39.942703570 -0400
++++ ceph-18.2.4/src/include/rados/rgw_file.h	2024-09-23 12:05:55.800441732 -0400
+@@ -27,7 +27,7 @@
+ 
+ #define LIBRGW_FILE_VER_MAJOR 1
+ #define LIBRGW_FILE_VER_MINOR 2
+-#define LIBRGW_FILE_VER_EXTRA 0
++#define LIBRGW_FILE_VER_EXTRA 1
+ 
+ #define LIBRGW_FILE_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
+ #define LIBRGW_FILE_VERSION_CODE LIBRGW_FILE_VERSION(LIBRGW_FILE_VER_MAJOR, LIBRGW_FILE_VER_MINOR, LIBRGW_FILE_VER_EXTRA)

0041-CMakeLists.txt.patch

@@ -0,0 +1,14 @@
+--- ceph-18.2.4/CMakeLists.txt.orig	2025-04-08 12:58:08.231622137 -0400
++++ ceph-18.2.4/CMakeLists.txt	2025-04-08 12:58:17.021471996 -0400
+@@ -739,11 +739,3 @@
+ option(WITH_GRAFANA "install grafana dashboards" OFF)
+ add_subdirectory(monitoring/ceph-mixin)
+ 
+-include(CTags)
+-option(CTAG_EXCLUDES "Exclude files/directories when running ctag.")
+-add_tags(ctags
+-  SRC_DIR src
+-  TAG_FILE tags
+-  EXCLUDE_OPTS ${CTAG_EXCLUDES}
+-  EXCLUDES "*.js" "*.css" ".tox" "python-common/build")
+-add_custom_target(tags DEPENDS ctags)

ceph-c99-1.patch

@@ -0,0 +1,58 @@
+commit f9aea9105b6c1a8d7bff0ec0675f84f2ffb1db6f
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed Dec 20 14:16:19 2023 +0100
+
+    tracing: Fix C type errors in librados tracing
+    
+    This fixes type errors like this:
+    
+    In file included from /usr/include/lttng/tracepoint-event.h:69,
+                     from …-build/include/tracing/librados.h:4143,
+                     from …/src/tracing/librados.c:6
+    :
+    …-build/include/tracing/librados.h:
+     In function ‘lttng_ust__event_probe__librados___rados_mon_command_exit’:
+    …-build/include/tracing/librados.h:477:9: error: initialization of ‘size_t’ {aka ‘long unsigned int’} from ‘size_t *’ {aka ‘long unsigned int *’} makes integer from pointer without a cast
+      477 |         ceph_ctf_integerp(size_t, outslen, outslen)
+          |         ^~~~~~~~~~~~~~~~~
+    
+    GCC 14 will likely treat these type mismatches as an error
+    and fail the build.
+    
+    Signed-off-by: Florian Weimer <fweimer@redhat.com>
+
+diff --git a/src/tracing/librados.tp b/src/tracing/librados.tp
+index 8b5e78ef15..8e116124b8 100644
+--- a/src/tracing/librados.tp
++++ b/src/tracing/librados.tp
+@@ -2628,7 +2628,7 @@ TRACEPOINT_EVENT(librados, rados_watch3_enter,
+     TP_FIELDS(
+         ctf_integer_hex(rados_ioctx_t, ioctx, ioctx)
+         ctf_string(oid, oid)
+-        ctf_integer_hex(uint64_t, phandle, phandle)
++        ctf_integer_hex(uint64_t*, phandle, phandle)
+         ctf_integer_hex(rados_watchcb2_t, callback, callback)
+         ctf_integer(uint32_t, timeout, timeout)
+         ctf_integer_hex(void*, arg, arg)
+@@ -2658,7 +2658,7 @@ TRACEPOINT_EVENT(librados, rados_aio_watch2_enter,
+         ctf_integer_hex(rados_ioctx_t, ioctx, ioctx)
+         ctf_string(oid, oid)
+         ctf_integer_hex(rados_completion_t, completion, completion)
+-        ctf_integer_hex(uint64_t, phandle, phandle)
++        ctf_integer_hex(uint64_t*, phandle, phandle)
+         ctf_integer_hex(rados_watchcb2_t, callback, callback)
+         ctf_integer(uint32_t, timeout, timeout)
+         ctf_integer_hex(void*, arg, arg)
+diff --git a/src/tracing/tracing-common.h b/src/tracing/tracing-common.h
+index 3e07f9de8e..03449ab588 100644
+--- a/src/tracing/tracing-common.h
++++ b/src/tracing/tracing-common.h
+@@ -21,7 +21,7 @@
+ // type should be an integer type
+ // val should have type type*
+ #define ceph_ctf_integerp(type, field, val) \
+-    ctf_integer(type, field, (val) == NULL ? 0 : (val)) \
++    ctf_integer(type, field, (val) == NULL ? 0 : *(val)) \
+     ctf_integer(uint8_t, field##_isnull, (val) == NULL)
+ 
+ // val should have type char*

ceph-c99-2.patch

@@ -0,0 +1,178 @@
+commit a49d154f4a8e493baf2296a15c7b5c56cd25e993
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Wed Dec 20 14:59:19 2023 +0100
+
+    pybind: Fix C type errors in Cython-generated Python bindings
+    
+    Several Ceph APIs use bool * types, which correspond to
+    libcpp.bool * types in Cython.  The bint type has an incorrect
+    size 4 and cannot be used as a replacement.
+    
+    This prevents a compilation failure with future compilers:
+    
+    …-build/src/pybind/rbd/rbd.c: In function ‘__pyx_pf_3rbd_3RBD_104namespace_exists’:
+    …-build/src/pybind/rbd/rbd.c:42165:76: error: passing argument 3 of ‘rbd_namespace_exists’ from incompatible pointer type
+    42165 |         __pyx_v_ret = rbd_namespace_exists(__pyx_v__ioctx, __pyx_v__name, (&__pyx_v__exists));
+          |                                                                           ~^~~~~~~~~~~~~~~~~
+          |                                                                            |
+          |                                                                            int *
+    In file included from …-build/src/pybind/rbd/rbd.c:1268:
+    …/src/include/rbd/librbd.h:1496:45: note: expected ‘_Bool *’ but argument is of type ‘int *’
+     1496 |                                       bool *exists);
+          |                                             ^
+    
+    Signed-off-by: Florian Weimer <fweimer@redhat.com>
+
+diff --git a/src/pybind/rbd/c_rbd.pxd b/src/pybind/rbd/c_rbd.pxd
+index 885f7bd46a..bda23bbc47 100644
+--- a/src/pybind/rbd/c_rbd.pxd
++++ b/src/pybind/rbd/c_rbd.pxd
+@@ -2,6 +2,7 @@
+ 
+ from libc.stdint cimport *
+ from ctime cimport time_t, timespec
++cimport libcpp
+ 
+ cdef extern from "rados/librados.h":
+     enum:
+@@ -525,7 +526,7 @@ cdef extern from "rbd/librbd.h" nogil:
+     int rbd_snap_unprotect(rbd_image_t image, const char *snap_name)
+     int rbd_snap_is_protected(rbd_image_t image, const char *snap_name,
+                               int *is_protected)
+-    int rbd_snap_exists(rbd_image_t image, const char *snapname, bint *exists)
++    int rbd_snap_exists(rbd_image_t image, const char *snapname, libcpp.bool *exists)
+     int rbd_snap_get_limit(rbd_image_t image, uint64_t *limit)
+     int rbd_snap_set_limit(rbd_image_t image, uint64_t limit)
+     int rbd_snap_get_timestamp(rbd_image_t image, uint64_t snap_id, timespec *timestamp)
+@@ -711,7 +712,7 @@ cdef extern from "rbd/librbd.h" nogil:
+     int rbd_namespace_list(rados_ioctx_t io, char *namespace_names,
+                            size_t *size)
+     int rbd_namespace_exists(rados_ioctx_t io, const char *namespace_name,
+-                             bint *exists)
++                             libcpp.bool *exists)
+ 
+     int rbd_pool_init(rados_ioctx_t, bint force)
+ 
+diff --git a/src/pybind/rbd/mock_rbd.pxi b/src/pybind/rbd/mock_rbd.pxi
+index 11872bd814..364f965fba 100644
+--- a/src/pybind/rbd/mock_rbd.pxi
++++ b/src/pybind/rbd/mock_rbd.pxi
+@@ -3,6 +3,11 @@
+ from libc.stdint cimport *
+ from ctime cimport time_t, timespec
+ 
++# Make the bool type available as libcpp.bool, for both C and C++.
++cimport libcpp
++cdef extern from "<stdbool.h>":
++    pass
++
+ cdef nogil:
+     enum:
+         _LIBRADOS_SNAP_HEAD "LIBRADOS_SNAP_HEAD"
+@@ -637,7 +642,7 @@ cdef nogil:
+     int rbd_snap_is_protected(rbd_image_t image, const char *snap_name,
+                               int *is_protected):
+         pass
+-    int rbd_snap_exists(rbd_image_t image, const char *snapname, bint *exists):
++    int rbd_snap_exists(rbd_image_t image, const char *snapname, libcpp.bool *exists):
+         pass
+     int rbd_snap_get_limit(rbd_image_t image, uint64_t *limit):
+         pass
+@@ -896,7 +901,7 @@ cdef nogil:
+                            size_t *size):
+         pass
+     int rbd_namespace_exists(rados_ioctx_t io, const char *namespace_name,
+-                             bint *exists):
++                             libcpp.bool *exists):
+         pass
+     int rbd_pool_init(rados_ioctx_t io, bint force):
+         pass
+diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
+index fcb2fb3470..f59ba23f0f 100644
+--- a/src/pybind/rbd/rbd.pyx
++++ b/src/pybind/rbd/rbd.pyx
+@@ -23,6 +23,7 @@ from libc cimport errno
+ from libc.stdint cimport *
+ from libc.stdlib cimport malloc, realloc, free
+ from libc.string cimport strdup, memset
++cimport libcpp
+ 
+ try:
+     from collections.abc import Iterable
+@@ -1935,12 +1936,12 @@ class RBD(object):
+         cdef:
+             rados_ioctx_t _ioctx = convert_ioctx(ioctx)
+             const char *_name = name
+-            bint _exists = False
++            libcpp.bool _exists = False
+         with nogil:
+             ret = rbd_namespace_exists(_ioctx, _name, &_exists)
+         if ret != 0:
+             raise make_ex(ret, 'error verifying namespace')
+-        return bool(_exists != 0)
++        return _exists
+ 
+     def namespace_list(self, ioctx):
+         """
+@@ -3679,12 +3680,12 @@ cdef class Image(object):
+         name = cstr(name, 'name')
+         cdef:
+             char *_name = name
+-            bint _exists = False
++            libcpp.bool _exists = False
+         with nogil:
+             ret = rbd_snap_exists(self.image, _name, &_exists)
+         if ret != 0:
+             raise make_ex(ret, 'error getting snapshot exists for %s' % self.name)
+-        return bool(_exists != 0)
++        return _exists
+ 
+     @requires_not_closed
+     def get_snap_limit(self):
+diff --git a/src/pybind/rgw/mock_rgw.pxi b/src/pybind/rgw/mock_rgw.pxi
+index ca893a5bb8..806d4df75d 100644
+--- a/src/pybind/rgw/mock_rgw.pxi
++++ b/src/pybind/rgw/mock_rgw.pxi
+@@ -1,5 +1,10 @@
+ # cython: embedsignature=True
+ 
++# Make the bool type available as libcpp.bool, for both C and C++.
++cimport libcpp
++cdef extern from "<stdbool.h>":
++    pass
++
+ cdef nogil:
+     ctypedef void* librgw_t
+ 
+@@ -111,8 +116,8 @@ cdef nogil:
+ 
+     int rgw_readdir(rgw_fs *fs,
+                     rgw_file_handle *parent_fh, uint64_t *offset,
+-                    bint (*cb)(const char *name, void *arg, uint64_t offset, stat *st, uint32_t st_mask, uint32_t flags) nogil except? -9000,
+-                    void *cb_arg, bint *eof, uint32_t flags) except? -9000:
++                    libcpp.bool (*cb)(const char *name, void *arg, uint64_t offset, stat *st, uint32_t st_mask, uint32_t flags) nogil except? -9000,
++                    void *cb_arg, libcpp.bool *eof, uint32_t flags) except? -9000:
+         pass
+ 
+     int rgw_getattr(rgw_fs *fs,
+diff --git a/src/pybind/rgw/rgw.pyx b/src/pybind/rgw/rgw.pyx
+index 9bbcdfff58..d210a70bbb 100644
+--- a/src/pybind/rgw/rgw.pyx
++++ b/src/pybind/rgw/rgw.pyx
+@@ -7,6 +7,7 @@ from cpython cimport PyObject, ref, exc, array
+ from libc.stdint cimport *
+ from libc.stdlib cimport malloc, realloc, free
+ from cstat cimport stat
++cimport libcpp
+ 
+ IF BUILD_DOC:
+     include "mock_rgw.pxi"
+@@ -373,7 +374,7 @@ cdef class LibRGWFS(object):
+         cdef:
+             rgw_file_handle *_dir_handler = <rgw_file_handle*>dir_handler.handler
+             uint64_t _offset = offset
+-            bint _eof
++            libcpp.bool _eof
+             uint32_t _flags = flags
+         with nogil:
+             ret = rgw_readdir(self.fs, _dir_handler, &_offset, &readdir_cb,

sources

@@ -1 +1 @@
-SHA512 (ceph-17.2.7.tar.gz) = 9005de7661c6a9d1054f1388cff2f48eb1af93565ebf852669de546eed594ed6a2668944b25a64c406d00f88bd2f7a6eac2ae96b04789c03ea4d248d1a683e7b
+SHA512 (ceph-18.2.6.tar.gz) = 06bef880543a3c444783ed4a3927fd94a7b05180d35d356372f36679f1e00c3ee2cf3b0c15732fdc0c1ba55c922e07b7fa66274cb12a196914c79faa99859f13