ceph-17.2.7, Requires: fuse -> fuse3

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

0002-src-common-CMakeLists.txt.patch

@@ -1,13 +0,0 @@
-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}")

0003-src-common-bitstr.h.patch

@@ -8,14 +8,3 @@
  
  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);

0006-src-blk-CMakeLists.txt.patch

@@ -1,11 +0,0 @@
---- 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)

0007-src-test-neorados-CMakeLists.txt.patch

@@ -1,11 +0,0 @@
---- 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)
- 

0009-librgw-notifications-initialize-kafka-and-amqp.patch

@@ -1,63 +0,0 @@
-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
-

0010-CET-Add-CET-marker-to-crc32c_intel_fast_zero_asm.s.patch

@@ -0,0 +1,27 @@
+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
+

0011-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assembly-co.patch

@@ -0,0 +1,172 @@
+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
+

0011-src-test-rgw-amqp_mock.cc.patch

@@ -1,23 +0,0 @@
---- 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,

0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch

@@ -0,0 +1,100 @@
+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
+

0012-src-compressor-snappy-SnappyCompressor.h.patch

@@ -1,11 +0,0 @@
---- 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;

0013-src-common-Formatter.cc.patch

@@ -1,10 +0,0 @@
---- 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 {

0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch

@@ -1,13 +0,0 @@
-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>
- 

0015-src-kv-rocksdb_cache.patch

@@ -1,296 +0,0 @@
-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;
-   }

0017-gcc-12-omnibus.patch

@@ -0,0 +1,63 @@
+--- 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 @@
+       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
+@@ -114,7 +114,7 @@
+ #include "rgw/rgw_common.h"
+ 
+ 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();
+@@ -142,7 +142,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-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 @@
+ 
+   std::string  print(int ident) override
+   {
+-    return std::string(0);
++    return std::string("");
+   }
+ 
+   void push_argument(base_statement* arg)

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

@@ -0,0 +1,37 @@
+--- 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 @@
+     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 @@
+ 
+ # 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)
+@@ -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

@@ -0,0 +1,43 @@
+--- 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;

0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch

@@ -0,0 +1,11 @@
+--- 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})

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,218 @@
+--- 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,73 @@
+--- ceph-17.2.5/src/common/subsys_types.h.orig	2023-01-17 05:29:55.711592884 -0500
++++ ceph-17.2.5/src/common/subsys_types.h	2023-01-17 05:31:05.759282197 -0500
+@@ -53,7 +53,7 @@
+ #undef DEFAULT_SUBSYS
+ }
+ 
+-constexpr static std::uint8_t
++constexpr static uint8_t
+ ceph_subsys_get_max_default_level(const std::size_t subidx) {
+   const auto item = ceph_subsys_get_as_array()[subidx];
+   return std::max(item.log_level, item.gather_level);
+--- ceph-17.2.5/src/msg/async/compression_onwire.h.orig	2023-01-17 07:34:31.923701878 -0500
++++ ceph-17.2.5/src/msg/async/compression_onwire.h	2023-01-17 07:35:04.493093534 -0500
+@@ -44,7 +44,7 @@
+ 
+   class TxHandler final : private Handler {
+   public:
+-    TxHandler(CephContext* const cct, CompressorRef compressor, int mode, std::uint64_t min_size)
++    TxHandler(CephContext* const cct, CompressorRef compressor, int mode, uint64_t min_size)
+       : Handler(cct, compressor),
+ 	m_min_size(min_size),
+ 	m_mode(static_cast<Compressor::CompressionMode>(mode))
+@@ -97,7 +97,7 @@
+     static rxtx_t create_handler_pair(
+       CephContext* ctx,
+       const CompConnectionMeta& comp_meta,
+-      std::uint64_t compress_min_size);
++      uint64_t compress_min_size);
+   };
+ }
+ 
+--- ceph-17.2.5/src/msg/async/crypto_onwire.h.orig	2023-01-17 07:35:35.535513714 -0500
++++ ceph-17.2.5/src/msg/async/crypto_onwire.h	2023-01-17 07:35:46.578307452 -0500
+@@ -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-17.2.5/src/test/librados/op_speed.cc.orig	2023-01-17 08:57:37.078531022 -0500
++++ ceph-17.2.5/src/test/librados/op_speed.cc	2023-01-17 08:57:58.259139439 -0500
+@@ -9,7 +9,7 @@
+   for (int i = 0; i < to_create; ++i) {
+     librados::ObjectReadOperation op;
+     bufferlist bl;
+-    std::uint64_t sz;
++    uint64_t sz;
+     struct timespec tm;
+     std::map<std::string, ceph::buffer::list> xattrs;
+     std::map<std::string, ceph::buffer::list> omap;
+--- ceph-17.2.5/src/test/mon/test_log_rss_usage.cc.orig	2023-01-17 10:14:37.552820230 -0500
++++ ceph-17.2.5/src/test/mon/test_log_rss_usage.cc	2023-01-17 10:15:12.319202506 -0500
+@@ -5,6 +5,7 @@
+ #include <string>
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+--- ceph-17.2.5/src/rocksdb/db/compaction/compaction_iteration_stats.h.orig	2023-01-26 17:05:20.605333926 -0500
++++ ceph-17.2.5/src/rocksdb/db/compaction/compaction_iteration_stats.h	2023-01-26 17:05:46.376880846 -0500
+@@ -6,6 +6,7 @@
+ #pragma once
+ 
+ #include "rocksdb/rocksdb_namespace.h"
++#include <cstdint>
+ 
+ struct CompactionIterationStats {
+   // Compaction statistics

0025-selinux-prepare-for-anon-inode-controls-enablement.patch

@@ -0,0 +1,42 @@
+From 73218e291ca68a927965bdffa7d43d0fc62c2718 Mon Sep 17 00:00:00 2001
+From: Ondrej Mosnacek <omosnace@redhat.com>
+Date: Wed, 27 Jul 2022 17:14:25 +0200
+Subject: [PATCH] selinux: prepare for anon inode controls enablement
+
+We plan to start labeling anon inodes (userfaultfd and io_uring file
+descriptors) properly in selinux-policy, which means that domains using
+these will need new rules.
+
+See: https://github.com/fedora-selinux/selinux-policy/pull/1351
+
+Since ceph may optionally use io_uring, this patch adds the necessary
+interface call to its policy to avoid a regression. As the new interface
+call is put under a conditional, the policy package will be buildable
+against selinux-policy with or without the above PR merged, but it will
+need to be rebuilt against the updated selinux-policy to actually pick
+up the new rules.
+
+I tested this on a minimal ceph cluster with 'bdev_ioring = true' added
+to ceph.conf. I got io_uring denials without this patch + with
+selinux-policy with PR#1351 and no denials with ceph rebuilt with this
+patch.
+
+Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
+---
+ selinux/ceph.te | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/selinux/ceph.te b/selinux/ceph.te
+index 77d35d9714b60..729bce1fc8589 100644
+--- a/selinux/ceph.te
++++ b/selinux/ceph.te
+@@ -75,6 +75,9 @@ manage_lnk_files_pattern(ceph_t, ceph_var_run_t, ceph_var_run_t)
+ 
+ kernel_read_system_state(ceph_t)
+ kernel_read_network_state(ceph_t)
++ifdef(`kernel_io_uring_use',`
++	kernel_io_uring_use(ceph_t)
++')
+ allow ceph_t kernel_t:system module_request;
+ 
+ corenet_all_recvfrom_unlabeled(ceph_t)

0026-src-boost-libs-python-src-object.patch

@@ -0,0 +1,99 @@
+--- ceph-17.2.5/src/boost/libs/python/src/object/enum.cpp.orig	2023-02-23 08:45:36.498595122 -0500
++++ ceph-17.2.5/src/boost/libs/python/src/object/enum.cpp	2023-02-23 08:46:11.277990890 -0500
+@@ -153,7 +153,7 @@
+   {
+       if (enum_type_object.tp_dict == 0)
+       {
+-          Py_TYPE(&enum_type_object) = incref(&PyType_Type);
++          Py_SET_TYPE(&enum_type_object, incref(&PyType_Type));
+ #if PY_VERSION_HEX >= 0x03000000
+           enum_type_object.tp_base = &PyLong_Type;
+ #else
+--- ceph-17.2.5/src/boost/libs/python/src/object/function.cpp.orig	2023-02-23 08:44:19.995920877 -0500
++++ ceph-17.2.5/src/boost/libs/python/src/object/function.cpp	2023-02-23 08:45:26.426770100 -0500
+@@ -107,7 +107,7 @@
+     PyObject* p = this;
+     if (Py_TYPE(&function_type) == 0)
+     {
+-        Py_TYPE(&function_type) = &PyType_Type;
++        Py_SET_TYPE(&function_type, &PyType_Type);
+         ::PyType_Ready(&function_type);
+     }
+     
+--- ceph-17.2.5/src/boost/libs/python/src/object/life_support.cpp.orig	2023-02-23 08:43:37.511650115 -0500
++++ ceph-17.2.5/src/boost/libs/python/src/object/life_support.cpp	2023-02-23 08:44:10.225088588 -0500
+@@ -93,7 +93,7 @@
+     
+     if (Py_TYPE(&life_support_type) == 0)
+     {
+-        Py_TYPE(&life_support_type) = &PyType_Type;
++        Py_SET_TYPE(&life_support_type, &PyType_Type);
+         PyType_Ready(&life_support_type);
+     }
+     
+--- ceph-17.2.5/src/boost/libs/python/src/object/class.cpp.orig	2023-02-23 08:46:22.394797757 -0500
++++ ceph-17.2.5/src/boost/libs/python/src/object/class.cpp	2023-02-23 10:54:56.016527900 -0500
+@@ -21,6 +21,7 @@
+ #include <boost/python/dict.hpp>
+ #include <boost/python/str.hpp>
+ #include <boost/python/ssize_t.hpp>
++#include <boost/align/detail/align.hpp>
+ #include <functional>
+ #include <vector>
+ #include <cstddef>
+@@ -208,7 +209,7 @@
+   {
+       if (static_data_object.tp_dict == 0)
+       {
+-          Py_TYPE(&static_data_object) = &PyType_Type;
++          Py_SET_TYPE(&static_data_object, &PyType_Type);
+           static_data_object.tp_base = &PyProperty_Type;
+           if (PyType_Ready(&static_data_object))
+               return 0;
+@@ -316,7 +317,7 @@
+   {
+       if (class_metatype_object.tp_dict == 0)
+       {
+-          Py_TYPE(&class_metatype_object) = &PyType_Type;
++          Py_SET_TYPE(&class_metatype_object, &PyType_Type);
+           class_metatype_object.tp_base = &PyType_Type;
+           if (PyType_Ready(&class_metatype_object))
+               return type_handle();
+@@ -374,12 +375,7 @@
+               // like, so we'll store the total size of the object
+               // there. A negative number indicates that the extra
+               // instance memory is not yet allocated to any holders.
+-#if PY_VERSION_HEX >= 0x02060000
+-              Py_SIZE(result) =
+-#else
+-              result->ob_size =
+-#endif
+-                  -(static_cast<int>(offsetof(instance<>,storage) + instance_size));
++              Py_SET_SIZE(result,-static_cast<int>(offsetof(instance<>,storage) + instance_size));
+           }
+           return (PyObject*)result;
+       }
+@@ -470,7 +466,7 @@
+   {
+       if (class_type_object.tp_dict == 0)
+       {
+-          Py_TYPE(&class_type_object) = incref(class_metatype().get());
++          Py_SET_TYPE(&class_type_object, incref(class_metatype().get()));
+           class_type_object.tp_base = &PyBaseObject_Type;
+           if (PyType_Ready(&class_type_object))
+               return type_handle();
+@@ -738,8 +734,13 @@
+         // holder_offset should at least point into the variable-sized part
+         assert(holder_offset >= offsetof(objects::instance<>,storage));
+ 
++        size_t allocated = holder_size + 8;
++        void* storage = (char*)self + holder_offset;
++        void* aligned_storage = ::boost::alignment::align(8, holder_size, storage, allocated); 
++
+         // Record the fact that the storage is occupied, noting where it starts
+-        Py_SIZE(self) = holder_offset;
++        const size_t offset = reinterpret_cast<uintptr_t>(aligned_storage) - reinterpret_cast<uintptr_t>(storage) + holder_offset;
++        Py_SET_SIZE(self, offset);
+         return (char*)self + holder_offset;
+     }
+     else

0028-cmake-modules-BuildBoost.cmake.patch

@@ -0,0 +1,15 @@
+--- ceph-17.2.6/cmake/modules/BuildBoost.cmake.orig	2023-04-27 14:00:28.239524778 -0400
++++ ceph-17.2.6/cmake/modules/BuildBoost.cmake	2023-04-28 07:49:59.743342207 -0400
+@@ -63,7 +63,11 @@
+   else()
+     list(APPEND boost_features "address-model=32")
+   endif()
+-  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
++    set(BOOST_CXXFLAGS "-fPIC -w -fcf-protection") # check on arm, etc <---XXX
++  else()
++    set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  endif()
+   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
+ 
+   set(boost_with_libs)

0029-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

sources

@@ -1 +1 @@
-SHA512 (ceph-16.2.7.tar.gz) = eab047e646970d444acf1064d98237b8b1677fb16b5e771082d55880f7bc6d8bdb278c2fe514c82ae12c438878d9ecea29139fa6b8d890f9f737138f10fb740c
+SHA512 (ceph-17.2.7.tar.gz) = 9005de7661c6a9d1054f1388cff2f48eb1af93565ebf852669de546eed594ed6a2668944b25a64c406d00f88bd2f7a6eac2ae96b04789c03ea4d248d1a683e7b