16.2.10 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Rebuild for CVE-2022-{24675,28327,29526 in golang}
2022-07-23 05:36:43 -04:00 · 2022-07-11 00:29:20 +02:00 · 2022-06-22 16:04:43 -04:00 · 2022-05-22 05:49:31 -04:00 · 2022-05-17 07:41:26 -04:00 · 2022-05-17 07:40:37 -04:00
33 changed files with 1499 additions and 1883 deletions
@@ -0,0 +1,13 @@
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 65ba10b0f1..eeedc29c37 100644
+--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
+@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
+     crc32c_aarch64.c)
+ endif(HAVE_INTEL)
+ 
+-add_library(crc32 ${crc32_srcs})
+add_library(crc32 STATIC ${crc32_srcs})
+ if(HAVE_ARMV8_CRC)
+   set_target_properties(crc32 PROPERTIES
+     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
@@ -8,3 +8,14 @@
 
 namespace ceph {
   class Formatter;
+--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
+++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
+@@ -16,6 +16,8 @@
+ #define CEPH_GLOBAL_SIGNAL_HANDLER_H
+
+ #include <signal.h>
+#include <string>
+
+ #include "acconfig.h"
+
+ typedef void (*signal_handler_t)(int);
@@ -0,0 +1,11 @@
+--- ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt.orig	2021-02-01 08:16:26.719517641 -0500
+++ ceph-16.1.0-43-g6b74fb5c/src/blk/CMakeLists.txt	2021-02-01 08:16:47.810092341 -0500
+@@ -25,7 +25,7 @@
+     zoned/HMSMRDevice.cc)
+ endif()
+ 
+-add_library(blk ${libblk_srcs})
+add_library(blk STATIC ${libblk_srcs})
+ target_include_directories(blk PRIVATE "./")
+ 
+ if(HAVE_LIBAIO)
@@ -0,0 +1,11 @@
+--- ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt.orig	2021-02-01 08:25:18.006965821 -0500
+++ ceph-16.1.0-43-g6b74fb5c/src/test/neorados/CMakeLists.txt	2021-02-01 08:25:34.244407147 -0500
+@@ -19,7 +19,7 @@
+ target_link_libraries(ceph_test_neorados_op_speed
+   libneorados fmt::fmt ${unittest_libs})
+ 
+-add_library(neoradostest-support common_tests.cc)
+add_library(neoradostest-support STATIC common_tests.cc)
+ target_link_libraries(neoradostest-support
+   libneorados fmt::fmt)
+ 
@@ -0,0 +1,63 @@
+From 178f6bdac97b57300bbe0956633cf686a7e3ccee Mon Sep 17 00:00:00 2001
+From: Yuval Lifshitz <ylifshit@redhat.com>
+Date: Fri, 12 Mar 2021 08:56:45 +0200
+Subject: [PATCH] librgw/notifications: initialize kafka and amqp
+
+Fixes: https://tracker.ceph.com/issues/49738
+
+Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
+---
+ src/rgw/librgw.cc | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
+index 012cc54c3b..a5351dbe7c 100644
+--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
+@@ -53,6 +53,12 @@
+ #include "rgw_http_client.h"
+ #include "rgw_http_client_curl.h"
+ #include "rgw_perf_counters.h"
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+#include "rgw_amqp.h"
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+#include "rgw_kafka.h"
+#endif
+ 
+ #include "services/svc_zone.h"
+ 
+@@ -617,6 +623,17 @@ namespace rgw {
+       /* ignore error */
+     }
+ 
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+    if (!rgw::amqp::init(cct.get())) {
+      derr << "ERROR: failed to initialize AMQP manager" << dendl;
+    }
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+    if (!rgw::kafka::init(cct.get())) {
+      derr << "ERROR: failed to initialize Kafka manager" << dendl;
+    }
+#endif
+
+     return 0;
+   } /* RGWLib::init() */
+ 
+@@ -645,6 +662,12 @@ namespace rgw {
+     rgw_shutdown_resolver();
+     rgw_http_client_cleanup();
+     rgw::curl::cleanup_curl();
+#ifdef WITH_RADOSGW_AMQP_ENDPOINT
+    rgw::amqp::shutdown();
+#endif
+#ifdef WITH_RADOSGW_KAFKA_ENDPOINT
+    rgw::kafka::shutdown();
+#endif
+ 
+     rgw_perf_stop(g_ceph_context);
+ 
+-- 
+2.26.2
+
@@ -1,27 +0,0 @@
-From 1999108aeb1f6f93a19ea7bb64c6ae8b87d1b264 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Thu, 20 Jan 2022 05:33:13 -0800
-Subject: [PATCH] CET: Add CET marker to crc32c_intel_fast_zero_asm.s
-
-Add .note.gnu.property section to crc32c_intel_fast_zero_asm.s to mark
-for IBT and SHSTK compatibility.
---
- src/common/crc32c_intel_fast_zero_asm.s | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/common/crc32c_intel_fast_zero_asm.s b/src/common/crc32c_intel_fast_zero_asm.s
-index 216ecf639f3..2e291d858f3 100644
--- a/src/common/crc32c_intel_fast_zero_asm.s
-+++ b/src/common/crc32c_intel_fast_zero_asm.s
-@@ -654,4 +654,8 @@ slversion crc32_iscsi_zero_00, 00,   02,  0014
- %ifidn __OUTPUT_FORMAT__, elf64
- ; inform linker that this doesn't require executable stack
- section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
- %endif
-- 
-2.34.1
-
@@ -1,172 +0,0 @@
-From bbcc1a69f787881f16156f3c789052942a564103 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Thu, 20 Jan 2022 05:35:49 -0800
-Subject: [PATCH] isa-l/CET: Add CET marker to x86-64 crc32 assembly codes
-
-Add .note.gnu.property section to x86-64 crc32 assembly codes to mark
-for IBT and SHSTK compatibility.
---
- crc/crc32_gzip_refl_by16_10.asm | 9 +++++++++
- crc/crc32_gzip_refl_by8.asm     | 9 +++++++++
- crc/crc32_gzip_refl_by8_02.asm  | 9 +++++++++
- crc/crc32_ieee_01.asm           | 8 ++++++++
- crc/crc32_ieee_02.asm           | 9 +++++++++
- crc/crc32_ieee_by16_10.asm      | 9 +++++++++
- crc/crc32_ieee_by4.asm          | 9 +++++++++
- crc/crc32_iscsi_00.asm          | 8 ++++++++
- crc/crc32_iscsi_01.asm          | 8 ++++++++
- 9 files changed, 78 insertions(+)
-
-diff --git a/src/isa-l/crc/crc32_gzip_refl_by16_10.asm b/src/isa-l/crc/crc32_gzip_refl_by16_10.asm
-index 40236f6..b16874d 100644
--- a/src/isa-l/crc/crc32_gzip_refl_by16_10.asm
-+++ b/src/isa-l/crc/crc32_gzip_refl_by16_10.asm
-@@ -566,3 +566,12 @@ global no_ %+ FUNCTION_NAME
- no_ %+ FUNCTION_NAME %+ :
- %endif
- %endif ; (AS_FEATURE_LEVEL) >= 10
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_gzip_refl_by8.asm b/src/isa-l/crc/crc32_gzip_refl_by8.asm
-index 62f7e7d..97b0c4a 100644
--- a/src/isa-l/crc/crc32_gzip_refl_by8.asm
-+++ b/src/isa-l/crc/crc32_gzip_refl_by8.asm
-@@ -622,3 +622,12 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
- 
- ;;;       func        core, ver, snum
- slversion crc32_gzip_refl_by8, 01,   00,  002c
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_gzip_refl_by8_02.asm b/src/isa-l/crc/crc32_gzip_refl_by8_02.asm
-index 80d849e..1d5a75f 100644
--- a/src/isa-l/crc/crc32_gzip_refl_by8_02.asm
-+++ b/src/isa-l/crc/crc32_gzip_refl_by8_02.asm
-@@ -553,3 +553,12 @@ pshufb_shf_table:
- ;       dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
- dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
- dq 0x0706050403020100, 0x000e0d0c0b0a0908
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_ieee_01.asm b/src/isa-l/crc/crc32_ieee_01.asm
-index 32495ed..cfc443b 100644
--- a/src/isa-l/crc/crc32_ieee_01.asm
-+++ b/src/isa-l/crc/crc32_ieee_01.asm
-@@ -653,3 +653,11 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
- ;;;       func        core, ver, snum
- slversion crc32_ieee_01, 01,   06,  0011
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_ieee_02.asm b/src/isa-l/crc/crc32_ieee_02.asm
-index 8a472b0..dd7096a 100644
--- a/src/isa-l/crc/crc32_ieee_02.asm
-+++ b/src/isa-l/crc/crc32_ieee_02.asm
-@@ -649,3 +649,12 @@ pshufb_shf_table:
- ;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
- dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
- dq 0x0706050403020100, 0x000e0d0c0b0a0908
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_ieee_by16_10.asm b/src/isa-l/crc/crc32_ieee_by16_10.asm
-index 200fd93..2afd597 100644
--- a/src/isa-l/crc/crc32_ieee_by16_10.asm
-+++ b/src/isa-l/crc/crc32_ieee_by16_10.asm
-@@ -582,3 +582,12 @@ global no_ %+ FUNCTION_NAME
- no_ %+ FUNCTION_NAME %+ :
- %endif
- %endif ; (AS_FEATURE_LEVEL) >= 10
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_ieee_by4.asm b/src/isa-l/crc/crc32_ieee_by4.asm
-index 39bed5a..847d0bd 100644
--- a/src/isa-l/crc/crc32_ieee_by4.asm
-+++ b/src/isa-l/crc/crc32_ieee_by4.asm
-@@ -563,3 +563,12 @@ SHUF_MASK	dq 0x08090A0B0C0D0E0F, 0x0001020304050607
- 
- ;;;       func             core, ver, snum
- slversion crc32_ieee_by4, 05,   02,  0017
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_iscsi_00.asm b/src/isa-l/crc/crc32_iscsi_00.asm
-index 4f81e3a..3d6b2d1 100644
--- a/src/isa-l/crc/crc32_iscsi_00.asm
-+++ b/src/isa-l/crc/crc32_iscsi_00.asm
-@@ -669,3 +669,11 @@ DD 0x54851c7f,0x89e3d7c4,0xeba4fdf8,0x36c23643
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_00, 00,   04,  0014
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/isa-l/crc/crc32_iscsi_01.asm b/src/isa-l/crc/crc32_iscsi_01.asm
-index 2a81517..c048413 100644
--- a/src/isa-l/crc/crc32_iscsi_01.asm
-+++ b/src/isa-l/crc/crc32_iscsi_01.asm
-@@ -588,3 +588,11 @@ K_table:
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_01, 01,   04,  0015
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-- 
-2.34.1
-
@@ -0,0 +1,23 @@
+--- a/src/test/rgw/amqp_mock.cc
+++ b/src/test/rgw/amqp_mock.cc
+@@ -291,7 +291,11 @@ amqp_confirm_select_ok_t* amqp_confirm_select(amqp_connection_state_t state, amq
+   return state->confirm;
+ }
+ 
+-int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *decoded_frame, struct timeval* tv) {
+extern "C" {
+
+int amqp_simple_wait_frame_noblock(amqp_connection_state_t state,
+                                   amqp_frame_t *decoded_frame,
+                                   const struct timeval* tv) {
+   if (state->socket && state->socket->open_called &&
+       state->login_called && state->channel1 && state->channel2 && state->exchange &&
+       state->queue && state->consume && state->confirm && !FAIL_NEXT_READ) {
+@@ -345,6 +349,7 @@ int amqp_simple_wait_frame_noblock(amqp_connection_state_t state, amqp_frame_t *
+   }
+   return AMQP_STATUS_CONNECTION_CLOSED;
+ }
+} // extern "C"
+ 
+ amqp_basic_consume_ok_t* amqp_basic_consume(
+     amqp_connection_state_t state, amqp_channel_t channel, amqp_bytes_t queue,
@@ -1,100 +0,0 @@
-From 72e6d27e08c86c16e8931739a5e6ecbc06b102d5 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Thu, 20 Jan 2022 05:40:56 -0800
-Subject: [PATCH] spdk/isa-l/CET: Add CET marker to x86-64 crc32 assembly codes
-
-Add .note.gnu.property section to x86-64 crc32 assembly codes to mark
-for IBT and SHSTK compatibility.
---
- crc/crc32_gzip_refl_by8.asm | 9 +++++++++
- crc/crc32_ieee_01.asm       | 8 ++++++++
- crc/crc32_ieee_by4.asm      | 9 +++++++++
- crc/crc32_iscsi_00.asm      | 8 ++++++++
- crc/crc32_iscsi_01.asm      | 8 ++++++++
- 5 files changed, 42 insertions(+)
-
-diff --git a/src/spdk/isa-l/crc/crc32_gzip_refl_by8.asm b/src/spdk/isa-l/crc/crc32_gzip_refl_by8.asm
-index 62f7e7d..97b0c4a 100644
--- a/src/spdk/isa-l/crc/crc32_gzip_refl_by8.asm
-+++ b/src/spdk/isa-l/crc/crc32_gzip_refl_by8.asm
-@@ -622,3 +622,12 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
- 
- ;;;       func        core, ver, snum
- slversion crc32_gzip_refl_by8, 01,   00,  002c
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/spdk/isa-l/crc/crc32_ieee_01.asm b/src/spdk/isa-l/crc/crc32_ieee_01.asm
-index 32495ed..cfc443b 100644
--- a/src/spdk/isa-l/crc/crc32_ieee_01.asm
-+++ b/src/spdk/isa-l/crc/crc32_ieee_01.asm
-@@ -653,3 +653,11 @@ dq 0x0706050403020100, 0x000e0d0c0b0a0908
- ;;;       func        core, ver, snum
- slversion crc32_ieee_01, 01,   06,  0011
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/spdk/isa-l/crc/crc32_ieee_by4.asm b/src/spdk/isa-l/crc/crc32_ieee_by4.asm
-index 39bed5a..847d0bd 100644
--- a/src/spdk/isa-l/crc/crc32_ieee_by4.asm
-+++ b/src/spdk/isa-l/crc/crc32_ieee_by4.asm
-@@ -563,3 +563,12 @@ SHUF_MASK	dq 0x08090A0B0C0D0E0F, 0x0001020304050607
- 
- ;;;       func             core, ver, snum
- slversion crc32_ieee_by4, 05,   02,  0017
-+
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/spdk/isa-l/crc/crc32_iscsi_00.asm b/src/spdk/isa-l/crc/crc32_iscsi_00.asm
-index 4f81e3a..3d6b2d1 100644
--- a/src/spdk/isa-l/crc/crc32_iscsi_00.asm
-+++ b/src/spdk/isa-l/crc/crc32_iscsi_00.asm
-@@ -669,3 +669,11 @@ DD 0x54851c7f,0x89e3d7c4,0xeba4fdf8,0x36c23643
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_00, 00,   04,  0014
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-diff --git a/src/spdk/isa-l/crc/crc32_iscsi_01.asm b/src/spdk/isa-l/crc/crc32_iscsi_01.asm
-index 2a81517..c048413 100644
--- a/src/spdk/isa-l/crc/crc32_iscsi_01.asm
-+++ b/src/spdk/isa-l/crc/crc32_iscsi_01.asm
-@@ -588,3 +588,11 @@ K_table:
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_01, 01,   04,  0015
- 
-+%ifidn __OUTPUT_FORMAT__, elf64
-+; inform linker that this doesn't require executable stack
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+; inform linker that this is compatible with IBT and SHSTK
-+section .note.gnu.property  note  alloc noexec align=8
-+DD 0x00000004,0x00000010,0x00000005,0x00554e47
-+DD 0xc0000002,0x00000004,0x00000003,0x00000000
-+%endif
-- 
-2.34.1
-
@@ -0,0 +1,11 @@
+--- ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h.orig	2021-05-26 08:30:26.205447315 -0400
+++ ceph-16.2.4/src/compressor/snappy/SnappyCompressor.h	2021-05-26 08:31:22.570443033 -0400
+@@ -97,7 +97,7 @@
+     if (qat_enabled)
+       return qat_accel.decompress(p, compressed_len, dst, compressor_message);
+ #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;
@@ -0,0 +1,10 @@
+--- ceph-16.2.4/src/common/Formatter.cc.orig	2021-07-07 09:32:25.513818420 -0400
+++ ceph-16.2.4/src/common/Formatter.cc	2021-07-07 09:44:42.007373294 -0400
+@@ -21,6 +21,7 @@
+ #include <fmt/format.h>
+ #include <set>
+ #include <limits>
+#include <algorithm>
+ 
+ // -----------------------
+ namespace ceph {
@@ -0,0 +1,13 @@
+diff --git a/src/rgw/rgw_string.h b/src/rgw/rgw_string.h
+index 257daa9c1fe..90e64f98a25 100644
+--- a/src/rgw/rgw_string.h
+++ b/src/rgw/rgw_string.h
+@@ -8,6 +8,8 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <string_view>
+#include <string>
+#include <stdexcept>
+ 
+ #include <boost/container/small_vector.hpp>
+ 
@@ -0,0 +1,296 @@
+diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.cc b/src/kv/rocksdb_cache/BinnedLRUCache.cc
+index 0d657883e92de..47c56e2ddd769 100644
+--- a/src/kv/rocksdb_cache/BinnedLRUCache.cc
+++ b/src/kv/rocksdb_cache/BinnedLRUCache.cc
+@@ -151,13 +151,20 @@ void BinnedLRUCacheShard::EraseUnRefEntries() {
+   }
+ }
+ 
+-void BinnedLRUCacheShard::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                           bool thread_safe) {
+void BinnedLRUCacheShard::ApplyToAllCacheEntries(
+  const std::function<void(const rocksdb::Slice& key,
+                           void* value,
+                           size_t charge,
+                           DeleterFn)>& callback,
+  bool thread_safe)
+{
+   if (thread_safe) {
+     mutex_.lock();
+   }
+   table_.ApplyToAllCacheEntries(
+-      [callback](BinnedLRUHandle* h) { callback(h->value, h->charge); });
+    [callback](BinnedLRUHandle* h) {
+      callback(h->key(), h->value, h->charge, h->deleter);
+    });
+   if (thread_safe) {
+     mutex_.unlock();
+   }
+@@ -345,7 +352,7 @@ bool BinnedLRUCacheShard::Release(rocksdb::Cache::Handle* handle, bool force_era
+ 
+ rocksdb::Status BinnedLRUCacheShard::Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                              size_t charge,
+-                             void (*deleter)(const rocksdb::Slice& key, void* value),
+                             DeleterFn deleter,
+                              rocksdb::Cache::Handle** handle, rocksdb::Cache::Priority priority) {
+   auto e = new BinnedLRUHandle();
+   rocksdb::Status s;
+@@ -464,6 +471,12 @@ std::string BinnedLRUCacheShard::GetPrintableOptions() const {
+   return std::string(buffer);
+ }
+ 
+DeleterFn BinnedLRUCacheShard::GetDeleter(rocksdb::Cache::Handle* h) const
+{
+  auto* handle = reinterpret_cast<BinnedLRUHandle*>(h);
+  return handle->deleter;
+}
+
+ BinnedLRUCache::BinnedLRUCache(CephContext *c, 
+                                size_t capacity, 
+                                int num_shard_bits,
+@@ -519,6 +532,13 @@ void BinnedLRUCache::DisownData() {
+ #endif  // !__SANITIZE_ADDRESS__
+ }
+ 
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+DeleterFn BinnedLRUCache::GetDeleter(Handle* handle) const
+{
+  return reinterpret_cast<const BinnedLRUHandle*>(handle)->deleter;
+}
+#endif
+
+ size_t BinnedLRUCache::TEST_GetLRUSize() {
+   size_t lru_size_of_all_shards = 0;
+   for (int i = 0; i < num_shards_; i++) {
+diff --git a/src/kv/rocksdb_cache/BinnedLRUCache.h b/src/kv/rocksdb_cache/BinnedLRUCache.h
+index 85608be0e5734..88bf4502e8927 100644
+--- a/src/kv/rocksdb_cache/BinnedLRUCache.h
+++ b/src/kv/rocksdb_cache/BinnedLRUCache.h
+@@ -56,7 +56,7 @@ std::shared_ptr<rocksdb::Cache> NewBinnedLRUCache(
+ 
+ struct BinnedLRUHandle {
+   void* value;
+-  void (*deleter)(const rocksdb::Slice&, void* value);
+  DeleterFn deleter;
+   BinnedLRUHandle* next_hash;
+   BinnedLRUHandle* next;
+   BinnedLRUHandle* prev;
+@@ -189,7 +189,7 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
+   // Like Cache methods, but with an extra "hash" parameter.
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                         size_t charge,
+-                        void (*deleter)(const rocksdb::Slice& key, void* value),
+                        DeleterFn deleter,
+                         rocksdb::Cache::Handle** handle,
+                         rocksdb::Cache::Priority priority) override;
+   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, uint32_t hash) override;
+@@ -205,13 +205,19 @@ class alignas(CACHE_LINE_SIZE) BinnedLRUCacheShard : public CacheShard {
+   virtual size_t GetUsage() const override;
+   virtual size_t GetPinnedUsage() const override;
+ 
+-  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                      bool thread_safe) override;
+  virtual void ApplyToAllCacheEntries(
+    const std::function<void(const rocksdb::Slice& key,
+                             void* value,
+                             size_t charge,
+                             DeleterFn)>& callback,
+    bool thread_safe) override;
+ 
+   virtual void EraseUnRefEntries() override;
+ 
+   virtual std::string GetPrintableOptions() const override;
+ 
+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const override;
+
+   void TEST_GetLRUList(BinnedLRUHandle** lru, BinnedLRUHandle** lru_low_pri);
+ 
+   //  Retrieves number of elements in LRU, for unit test purpose only
+@@ -304,7 +310,9 @@ class BinnedLRUCache : public ShardedCache {
+   virtual size_t GetCharge(Handle* handle) const override;
+   virtual uint32_t GetHash(Handle* handle) const override;
+   virtual void DisownData() override;
+-
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual DeleterFn GetDeleter(Handle* handle) const override;
+#endif
+   //  Retrieves number of elements in LRU, for unit test purpose only
+   size_t TEST_GetLRUSize();
+   // Sets the high pri pool ratio
+diff --git a/src/kv/rocksdb_cache/ShardedCache.cc b/src/kv/rocksdb_cache/ShardedCache.cc
+index 367140a94d8be..6cbd89ad6472c 100644
+--- a/src/kv/rocksdb_cache/ShardedCache.cc
+++ b/src/kv/rocksdb_cache/ShardedCache.cc
+@@ -44,7 +44,7 @@ void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) {
+ }
+ 
+ rocksdb::Status ShardedCache::Insert(const rocksdb::Slice& key, void* value, size_t charge,
+-                            void (*deleter)(const rocksdb::Slice& key, void* value),
+                            DeleterFn deleter,
+                             rocksdb::Cache::Handle** handle, Priority priority) {
+   uint32_t hash = HashSlice(key);
+   return GetShard(Shard(hash))
+@@ -109,13 +109,36 @@ size_t ShardedCache::GetPinnedUsage() const {
+   return usage;
+ }
+ 
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+DeleterFn ShardedCache::GetDeleter(Handle* handle) const
+{
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->GetDeleter(handle);
+}
+
+void ShardedCache::ApplyToAllEntries(
+    const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
+                             DeleterFn deleter)>& callback,
+    const ApplyToAllEntriesOptions& opts)
+{
+  int num_shards = 1 << num_shard_bits_;
+  for (int s = 0; s < num_shards; s++) {
+    GetShard(s)->ApplyToAllCacheEntries(callback, true /* thread_safe */);
+  }
+}
+#else
+ void ShardedCache::ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+                                           bool thread_safe) {
+   int num_shards = 1 << num_shard_bits_;
+   for (int s = 0; s < num_shards; s++) {
+-    GetShard(s)->ApplyToAllCacheEntries(callback, thread_safe);
+    GetShard(s)->ApplyToAllCacheEntries(
+      [callback](const rocksdb::Slice&, void* value, size_t charge, DeleterFn) {
+        callback(value, charge);
+      },
+      thread_safe);
+   }
+ }
+#endif
+ 
+ void ShardedCache::EraseUnRefEntries() {
+   int num_shards = 1 << num_shard_bits_;
+@@ -131,7 +154,7 @@ std::string ShardedCache::GetPrintableOptions() const {
+   char buffer[kBufferSize];
+   {
+     std::lock_guard<std::mutex> l(capacity_mutex_);
+-    snprintf(buffer, kBufferSize, "    capacity : %" ROCKSDB_PRIszt "\n",
+    snprintf(buffer, kBufferSize, "    capacity : %zu\n",
+              capacity_);
+     ret.append(buffer);
+     snprintf(buffer, kBufferSize, "    num_shard_bits : %d\n", num_shard_bits_);
+diff --git a/src/kv/rocksdb_cache/ShardedCache.h b/src/kv/rocksdb_cache/ShardedCache.h
+index 4d64893ab1c7b..f98421a09a33a 100644
+--- a/src/kv/rocksdb_cache/ShardedCache.h
+++ b/src/kv/rocksdb_cache/ShardedCache.h
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <mutex>
+ 
+#include "rocksdb/version.h"
+ #include "rocksdb/cache.h"
+ #include "include/ceph_hash.h"
+ #include "common/PriorityCache.h"
+@@ -22,10 +23,11 @@
+ #ifndef CACHE_LINE_SIZE
+ #define CACHE_LINE_SIZE 64 // XXX arch-specific define 
+ #endif
+-#define ROCKSDB_PRIszt "zu"
+ 
+ namespace rocksdb_cache {
+ 
+using DeleterFn = void (*)(const rocksdb::Slice& key, void* value);
+
+ // Single cache shard interface.
+ class CacheShard {
+  public:
+@@ -34,7 +36,7 @@ class CacheShard {
+ 
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, uint32_t hash, void* value,
+                                  size_t charge,
+-                                 void (*deleter)(const rocksdb::Slice& key, void* value),
+                                 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 bool Ref(rocksdb::Cache::Handle* handle) = 0;
+@@ -44,10 +46,15 @@ class CacheShard {
+   virtual void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
+   virtual size_t GetUsage() const = 0;
+   virtual size_t GetPinnedUsage() const = 0;
+-  virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+-                                      bool thread_safe) = 0;
+  virtual void ApplyToAllCacheEntries(
+    const std::function<void(const rocksdb::Slice& key,
+                             void* value,
+                             size_t charge,
+                             DeleterFn)>& callback,
+    bool thread_safe) = 0;
+   virtual void EraseUnRefEntries() = 0;
+   virtual std::string GetPrintableOptions() const { return ""; }
+  virtual DeleterFn GetDeleter(rocksdb::Cache::Handle* handle) const = 0;
+ };
+ 
+ // Generic cache interface which shards cache by hash of keys. 2^num_shard_bits
+@@ -57,34 +64,43 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
+  public:
+   ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit);
+   virtual ~ShardedCache() = default;
+  // rocksdb::Cache
+   virtual const char* Name() const override = 0;
+-  virtual CacheShard* GetShard(int shard) = 0;
+-  virtual const CacheShard* GetShard(int shard) const = 0;
+-  virtual void* Value(Handle* handle) override = 0;
+-  virtual size_t GetCharge(Handle* handle) const = 0;
+-  virtual uint32_t GetHash(Handle* handle) const = 0;
+-  virtual void DisownData() override = 0;
+-
+-  virtual void SetCapacity(size_t capacity) override;
+-  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
+-
+   virtual rocksdb::Status Insert(const rocksdb::Slice& key, void* value, size_t charge,
+-                                 void (*deleter)(const rocksdb::Slice& key, void* value),
+                                 DeleterFn,
+                                  rocksdb::Cache::Handle** handle, Priority priority) override;
+   virtual rocksdb::Cache::Handle* Lookup(const rocksdb::Slice& key, rocksdb::Statistics* stats) override;
+   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;
+   virtual void Erase(const rocksdb::Slice& key) override;
+   virtual uint64_t NewId() override;
+-  virtual size_t GetCapacity() const override;
+  virtual void SetCapacity(size_t capacity) override;
+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
+   virtual bool HasStrictCapacityLimit() const override;
+  virtual size_t GetCapacity() const override;
+   virtual size_t GetUsage() const override;
+   virtual size_t GetUsage(rocksdb::Cache::Handle* handle) const override;
+   virtual size_t GetPinnedUsage() const override;
+  virtual size_t GetCharge(Handle* handle) const = 0;
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual DeleterFn GetDeleter(Handle* handle) const override;
+#endif
+  virtual void DisownData() override = 0;
+#if (ROCKSDB_MAJOR >= 6 && ROCKSDB_MINOR >= 22)
+  virtual void ApplyToAllEntries(
+      const std::function<void(const rocksdb::Slice& key, void* value, size_t charge,
+                               DeleterFn deleter)>& callback,
+      const ApplyToAllEntriesOptions& opts) override;
+#else
+   virtual void ApplyToAllCacheEntries(void (*callback)(void*, size_t),
+                                       bool thread_safe) override;
+#endif
+   virtual void EraseUnRefEntries() override;
+   virtual std::string GetPrintableOptions() const override;
+  virtual CacheShard* GetShard(int shard) = 0;
+  virtual const CacheShard* GetShard(int shard) const = 0;
+  virtual uint32_t GetHash(Handle* handle) const = 0;
+ 
+   int GetNumShardBits() const { return num_shard_bits_; }
+ 
+@@ -120,7 +136,7 @@ class ShardedCache : public rocksdb::Cache, public PriorityCache::PriCache {
+ //    return Hash(s.data(), s.size(), 0);
+   }
+ 
+-  uint32_t Shard(uint32_t hash) {
+  uint32_t Shard(uint32_t hash) const {
+     // Note, hash >> 32 yields hash in gcc, not the zero we expect!
+     return (num_shard_bits_ > 0) ? (hash >> (32 - num_shard_bits_)) : 0;
+   }
@@ -1,23 +0,0 @@
--- ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp.orig	2021-12-07 08:02:04.682972474 -0500
-+++ ceph-16.2.6-681-gfdc003bc/src/tracing/bluestore.tp	2021-12-07 08:03:13.840771852 -0500
-@@ -1,3 +1,9 @@
-+
-+#ifdef __x86_64__
-+#undef STAP_SDT_ARG_CONSTRAINT
-+#define STAP_SDT_ARG_CONSTRAINT norx
-+#endif
-+
- #include "include/int_types.h"
- 
- TRACEPOINT_EVENT(bluestore, transaction_state_duration,
--- ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp.orig	2021-12-07 09:50:16.467579483 -0500
-+++ ceph-16.2.6-681-gfdc003bc/src/tracing/librbd.tp	2021-12-07 09:50:47.620026940 -0500
-@@ -1,3 +1,8 @@
-+#ifdef __x86_64__
-+#undef STAP_SDT_ARG_CONSTRAINT
-+#define STAP_SDT_ARG_CONSTRAINT norx
-+#endif
-+
- #include "tracing/tracing-common.h"
- #include "include/rbd/librbd.h"
- #include "include/int_types.h"
@@ -1,42 +0,0 @@
--- 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 @@
-       return "crit";
-     default:
-       ceph_abort();
-      return 0;
-+      return "";
-   }
- }
- 
--- 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
-@@ -120,7 +120,7 @@
- }
- 
- void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count,
-			   std::string fp_algo = NULL)
-+			   std::string fp_algo = "")
- {
-   bufferlist t;
-   int size = foid.length();
-@@ -148,7 +148,7 @@
-   ASSERT_LE(count, refs.count());
- }
- 
-string get_fp_oid(string oid, std::string fp_algo = NULL)
-+string get_fp_oid(string oid, std::string fp_algo = "")
- {
-   if (fp_algo == "sha1") {
-     unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 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 @@
- 
-   std::string  print(int ident) override
-   {
-    return std::string(0);
-+    return std::string("");
-   }
- 
-   void push_argument(base_statement* arg)
@@ -1,19 +0,0 @@
--- 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/rgw"
-     PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/store/rados"
-@@ -49,6 +49,7 @@
- 
- # add pthread library
- set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} pthread)
-+set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} global)
- 
- find_package(gtest QUIET)
- if(WITH_TESTS)
@@ -1,11 +0,0 @@
--- ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake.orig	2022-04-08 11:27:53.593570634 -0400
-+++ ceph-17.1.0-175-g086c8f84/src/arrow/cpp/cmake_modules/ThirdpartyToolchain.cmake	2022-04-08 11:28:20.778087653 -0400
-@@ -1991,7 +1991,7 @@
- 
- if((NOT ARROW_SIMD_LEVEL STREQUAL "NONE") OR (NOT ARROW_RUNTIME_SIMD_LEVEL STREQUAL "NONE"
-                                              ))
-  set(xsimd_SOURCE "BUNDLED")
-+  set(xsimd_SOURCE "SYSTEM")
-   resolve_dependency(xsimd)
-   # TODO: Don't use global includes but rather target_include_directories
-   include_directories(SYSTEM ${XSIMD_INCLUDE_DIR})
@@ -1,42 +0,0 @@
--- 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"
- 
@@ -1,32 +0,0 @@
--- 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"
@@ -1,199 +0,0 @@
--- 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()) {
@@ -1,151 +0,0 @@
--- 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;
@@ -1,17 +0,0 @@
--- 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>
@@ -1,61 +0,0 @@
--- 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());
@@ -1,24 +0,0 @@
--- 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)
@@ -1,61 +0,0 @@
--- 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
@@ -1,24 +0,0 @@
--- 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
-     """
@@ -1,18 +0,0 @@
--- 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)
@@ -1,11 +0,0 @@
--- 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)
@@ -1,14 +0,0 @@
--- 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)
@@ -1,58 +0,0 @@
-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*
@@ -1,178 +0,0 @@
-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,
@@ -1 +1 @@
-SHA512 (ceph-18.2.6.tar.gz) = 06bef880543a3c444783ed4a3927fd94a7b05180d35d356372f36679f1e00c3ee2cf3b0c15732fdc0c1ba55c922e07b7fa66274cb12a196914c79faa99859f13
+SHA512 (ceph-16.2.10.tar.gz) = ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b
Author	SHA1	Message	Date
Kaleb S. KEITHLEY	de756033dc	16.2.10 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-07-23 05:36:43 -04:00
Robert-André Mauchin	d5e008dea3	Rebuild for CVE-2022-{24675,28327,29526 in golang}	2022-07-11 00:29:20 +02:00
Kaleb S. KEITHLEY	f4f1584c5a	16.2.9, rhbz#2100237 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-06-22 16:04:43 -04:00
Kaleb S. KEITHLEY	181ccbff04	16.2.9 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-05-22 05:49:31 -04:00
Kaleb S. KEITHLEY	89cb92cf8f	16.2.8 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-05-17 07:41:26 -04:00
Kaleb S. KEITHLEY	8d5516c09d	16.2.8 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-05-17 07:40:37 -04:00
Kaleb S. KEITHLEY	08bc305406	16.2.7, Boost license, rhbz#2061615 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2022-03-09 13:34:10 -05:00
Kaleb S. KEITHLEY	44d9423cef	16.2.7, rebuild with systemtap-4.6-4 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2021-12-21 09:41:40 -05:00
Kaleb S. KEITHLEY	8d1e59bf45	16.2.7 GA Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2021-12-08 06:56:19 -05:00
Kaleb S. KEITHLEY	a1b7bb3569	Rebuilt for rocksdb-6.22, again; forgot an override was needed Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>	2021-09-28 16:43:06 -04:00