16.2.10 GA

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

0002-src-common-CMakeLists.txt.patch

@@ -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}")

0006-src-blk-CMakeLists.txt.patch

@@ -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)

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

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

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

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

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

@@ -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,

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

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

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

@@ -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;

0013-src-common-Formatter.cc.patch

@@ -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 {

0016-src-tracing-patch

@@ -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"

0017-gcc-12-omnibus.patch

@@ -1,63 +0,0 @@
---- 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-16.2.7/src/s3select/include/s3select_functions.h.orig	2022-01-19 15:06:45.312783565 -0500
-+++ ceph-16.2.7/src/s3select/include/s3select_functions.h	2022-01-19 15:08:17.270087590 -0500
-@@ -142,7 +142,7 @@
- 
-   virtual std::string  print(int ident)
-   {
--    return std::string(0);
-+    return std::string("");
-   }
- 
-   void push_argument(base_statement* arg)

0018-src-test-CmakeLists.txt.patch

@@ -1,12 +0,0 @@
---- ceph-16.2.11/src/test/CMakeLists.txt.orig	2023-01-27 09:08:53.899536043 -0500
-+++ ceph-16.2.11/src/test/CMakeLists.txt	2023-01-27 09:09:28.245931182 -0500
-@@ -83,6 +83,9 @@
-   if(WITH_RADOSGW_KAFKA_ENDPOINT)
-     list(APPEND rgw_libs kafka_stub)
-   endif()
-+  if(WITH_RADOSGW_LUA_PACKAGES)
-+    list(APPEND rgw_libs Boost::filesystem)
-+  endif()
-   add_subdirectory(rgw)
- endif(WITH_RADOSGW)
- if(WITH_RBD AND NOT WIN32)

0019-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,10 +0,0 @@
---- ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake.orig	2022-06-03 08:45:32.341075140 -0400
-+++ ceph-17.2.0-359-gb2fe9ec8/cmake/modules/CheckCxxAtomic.cmake	2022-06-03 08:46:47.195775813 -0400
-@@ -21,6 +21,7 @@
- // 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) __attribute__ ((used));
- bool atomic16(std::atomic<unsigned __int128> *ptr)
- {
-   return *ptr != 0;

ceph.spec

@@ -31,15 +31,9 @@
 %else
 %bcond_without tcmalloc
 %endif
-%if 0%{?rhel} >= 9
-%bcond_without system_pmdk
-%else
 %bcond_with system_pmdk
-%endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
-# ppc64le excluded pending resolution of
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104172
 %ifarch x86_64 ppc64le
 %bcond_without rbd_rwl_cache
 %bcond_without rbd_ssd_cache
@@ -129,18 +123,11 @@
 # disable dwz which compresses the debuginfo
 %global _find_debuginfo_dwz_opts %{nil}
 
-%if 0%{with seastar}
-# disable -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1, as gcc-toolset-{9,10}-annobin
-# do not provide gcc-annobin.so anymore, despite that they provide annobin.so. but
-# redhat-rpm-config still passes -fplugin=gcc-annobin to the compiler.
-%undefine _annotated_build
-%endif
-
 #################################################################################
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	16.2.13
+Version:	16.2.10
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -152,7 +139,7 @@ Epoch:		2
 
 Summary:	User space components of the Ceph file system
 #License:	LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT
-License:	(LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT
+License:	(LGPLv2.1 or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
@@ -162,14 +149,8 @@ Patch0001:	0001-src-common-crc32c_intel_fast.patch
 Patch0003:	0003-src-common-bitstr.h.patch
 Patch0007:	0007-src-test-neorados-CMakeLists.txt.patch
 Patch0008:	0008-cmake-modules-Finduring.cmake.patch
-Patch0010:	0010-CET-Add-CET-marker-to-crc32c_intel_fast_zero_asm.s.patch
-Patch0011:	0011-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assembly-co.patch
-Patch0012:	0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch
+Patch0014:	0014-rgw-Replace-boost-string_ref-view-with-std-string_vi.patch
 Patch0015:	0015-src-kv-rocksdb_cache.patch
-Patch0016:	0016-src-tracing-patch
-Patch0017:	0017-gcc-12-omnibus.patch
-Patch0018:	0018-src-test-CmakeLists.txt.patch
-Patch0019:	0019-cmake-modules-CheckCxxAtomic.cmake.patch
 # Source1:	cmake-modules-BuildBoost.cmake.noautopatch
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
@@ -202,9 +183,6 @@ BuildRequires:	gcc-toolset-9-gcc-c++ >= 9.2.1-2.3
 %else
 BuildRequires:	gcc-c++
 %endif
-%ifarch x86_64 aarch64
-BuildRequires:	mold
-%endif
 %if 0%{with tcmalloc}
 # libprofiler did not build on ppc64le until 2.7.90
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -270,6 +248,7 @@ BuildRequires:  %{luarocks_package_name}
 BuildRequires:	jq
 BuildRequires:	libuuid-devel
 BuildRequires:	python%{python3_pkgversion}-bcrypt
+BuildRequires:	python%{python3_pkgversion}-nose
 BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-requests
 BuildRequires:	python%{python3_pkgversion}-dateutil
@@ -345,7 +324,6 @@ BuildRequires:	rdma-core-devel
 BuildRequires:	liblz4-devel >= 1.7
 # for prometheus-alerts
 BuildRequires:	golang-github-prometheus-prometheus
-BuildRequires:	jsonnet
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	systemd
@@ -367,8 +345,8 @@ BuildRequires:	python%{python3_pkgversion}-sphinx
 BuildRequires:	lz4-devel >= 1.7
 %endif
 # distro-conditional make check dependencies
-%if 0%{with make_check}
 BuildRequires:	golang
+%if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	golang-github-prometheus
 BuildRequires:	libtool-ltdl-devel
@@ -388,7 +366,6 @@ BuildRequires:	python%{python3_pkgversion}-pyOpenSSL
 %endif
 %if 0%{?suse_version}
 BuildRequires:	golang-github-prometheus-prometheus
-BuildRequires:	jsonnet
 BuildRequires:	libxmlsec1-1
 BuildRequires:	libxmlsec1-nss1
 BuildRequires:	libxmlsec1-openssl1
@@ -593,7 +570,6 @@ Group:		System/Filesystems
 Requires:	ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
 Requires:	ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{python3_pkgversion}-setuptools
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	python%{python3_pkgversion}-cherrypy
 Requires:	python%{python3_pkgversion}-jwt
@@ -643,7 +619,6 @@ Requires:	python%{python3_pkgversion}-pecan
 Requires:	python%{python3_pkgversion}-pyOpenSSL
 Requires:	python%{python3_pkgversion}-requests
 Requires:	python%{python3_pkgversion}-dateutil
-Requires:	python%{python3_pkgversion}-setuptools
 %if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:	python%{python3_pkgversion}-cherrypy
 Requires:	python%{python3_pkgversion}-pyyaml
@@ -1249,11 +1224,9 @@ This package provides Ceph default alerts for Prometheus.
 # %%endif
 
 %build
-# Disable lto on systems that do not support symver attribute
-# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200 for details
-%if ( 0%{?rhel} && 0%{?rhel} < 9 ) || ( 0%{?suse_version} && 0%{?suse_version} <= 1500 )
- %define _lto_cflags %{nil}
-%endif
+# LTO can be enabled as soon as the following GCC bug is fixed:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
+%define _lto_cflags %{nil}
 
 %if 0%{with seastar} && 0%{?rhel}
 . /opt/rh/gcc-toolset-9/enable
@@ -1289,20 +1262,24 @@ CEPH_SMP_NCPUS="1"
 CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
 CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
 %endif
+%if 0%{?__isa_bits} == 32
+# 32-bit builds can use 3G memory max, which is not enough even for -j2
+CEPH_SMP_NCPUS="1"
+%endif
 # do not eat all memory
 echo "Available memory:"
 free -h
 echo "System limits:"
 ulimit -a
 if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then
-    mem_per_process=3000
+    mem_per_process=2500
     max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"
     test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits"
 fi
 export CEPH_SMP_NCPUS
-export CEPH_MFLAGS_JOBS="-j $CEPH_SMP_NCPUS"
+export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS"
 
 env | sort
 
@@ -1392,9 +1369,6 @@ mkdir -p %{_vpath_builddir}
     -DWITH_SYSTEM_ZSTD:BOOL=ON \
 %if 0%{?rhel}
     -DWITH_FMT_HEADER_ONLY:BOOL=ON \
-%endif
-%ifarch x86_64 aarch64
-    -DCMAKE_LINKER=%{_bindir}/ld.mold \
 %endif
     -DWITH_GRAFANA:BOOL=ON
 
@@ -1406,7 +1380,7 @@ cat ./CMakeFiles/CMakeError.log
 export VERBOSE=1
 export V=1
 export GCC_COLORS=
-%cmake_build "$CEPH_MFLAGS_JOBS"
+%cmake_build
 
 
 %if 0%{with make_check}
@@ -1631,8 +1605,6 @@ exit 0
 %{_bindir}/rbd-replay-prep
 %endif
 %{_bindir}/ceph-post-file
-%dir %{_libdir}/ceph/denc
-%{_libdir}/ceph/denc/denc-mod-*.so
 %{_tmpfilesdir}/ceph-common.conf
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-conf.8*
@@ -2536,72 +2508,32 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
-* Tue May 9 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.13-1
-- 16.2.13 GA
-
-* Thu Apr 13 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.12-1
-- 16.2.12 GA
-
-* Wed Jan 25 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.11-1
-- 16.2.11 GA
-- elide __isa_bits == 32 test, haven't done 32-bit builds for some time,
-  increase mem_per_process for ppc64le
-
 * Fri Jul 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.10-1
 - 16.2.10 GA
 
-* Wed Jun 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.9-3
-- 16.2.9 rhbz#2100237
+* Sun Jul 10 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2:16.2.9-3
+- Rebuild for CVE-2022-{24675,28327,29526 in golang}
 
-* Wed Jun 22 2022 Robert-André Mauchin <zebob.m@gmail.com> - 2:16.2.9-2
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
+* Wed Jun 22 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.9-2
+- 16.2.9, rhbz#2100237
 
 * Thu May 19 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.9-1
 - 16.2.9 GA
 
-* Mon May 16 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.8-1
+* Tue May 17 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.8-1
 - 16.2.8 GA
 
-* Tue Mar 8 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-11
-- 16.2.7, Boost license name
+* Wed Mar 9 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-3
+- 16.2.7, Boost license, rhbz#2061615
 
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2:16.2.7-10
-- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Feb 2 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-9
-- 16.2.7, python3.10 w/ __CHAR_UNSIGNED__ fix
-
-* Thu Jan 27 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-8
-- 16.2.7, w/ modern linker (mold), x86_64 and aarch64, this time for real
-
-* Wed Jan 26 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-7
-- 16.2.7, build with modern linker (mold), x86_64 and aarch64
-- reenable ppc64le
-
-* Tue Jan 25 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-6
-- 16.2.7, more CET enablement, rhbz#2040091
-
-* Thu Jan 20 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-5
-- 16.2.7, rebuild with gcc-12, exclude ppc64le until fmt on ppc64le is fixed
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:16.2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 10 2022 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-3
-- 16.2.7, rebuild with fmt-8.1.1
-
-* Wed Dec 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-2
-- 16.2.7, LGPLv2.1 -> LGPLv2+, rhbz#2036035
+* Tue Dec 21 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-2
+- 16.2.7, rebuild with systemtap-4.6-4
 
 * Tue Dec 7 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-1
 - 16.2.7 GA
 
-* Tue Nov 02 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2:16.2.6-3
-- rebuild against new liblttng-ust
-
-* Tue Oct 19 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-2
-- 16.2.6, rebuild with rocksdb 6.25
+* Tue Sep 28 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-2
+- Rebuilt for rocksdb-6.22, again; forgot an override was needed
 
 * Fri Sep 17 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-1
 - 16.2.6 GA

sources

@@ -1 +1 @@
-SHA512 (ceph-16.2.13.tar.gz) = 39ec2bed1de0276f08bf93241f9fb275893041fd5f20ade75e68728107011ae5d01aed532d5afd8805951d09061a5a3d96c4311701c8897a29668f77126c19ab
+SHA512 (ceph-16.2.10.tar.gz) = ae164c24462c3e08763d202acc3e2fe86ffc09f312b5059bae07863e804fc47bd158fc130aa2923246ffcfe26ae6d6d9317326aec96373226e6f9030d7123c8b