diff --git a/0029-src-rgw-rgw_amqp.cc.patch b/0029-src-rgw-rgw_amqp.cc.patch deleted file mode 100644 index 8cd8fa9..0000000 --- a/0029-src-rgw-rgw_amqp.cc.patch +++ /dev/null @@ -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 --#include --#include --#include -+#include -+#include -+#include -+#include - #include "include/ceph_assert.h" - #include - #include diff --git a/0033-boost-asm.patch b/0033-boost-asm.patch index 80ee1fd..bc697b7 100644 --- a/0033-boost-asm.patch +++ b/0033-boost-asm.patch @@ -1,6 +1,27 @@ ---- 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 @@ +--- ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S.orig 2025-05-19 18:28:37.137194693 -0400 ++++ ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2025-05-19 18:30:54.292857720 -0400 +@@ -144,4 +144,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 + # endif +--- ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S.orig 2025-05-19 18:28:22.611442193 -0400 ++++ ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2025-05-19 18:31:01.037742795 -0400 +@@ -159,4 +159,18 @@ /* Mark that we don't need executable stack. */ .section .note.GNU-stack,"",%progbits @@ -18,30 +39,10 @@ + .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 @@ + # endif +--- ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S.orig 2025-05-19 18:29:35.836194529 -0400 ++++ ceph-20.0.0-1954-g77a7c83d/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2025-05-19 18:31:15.172501956 -0400 +@@ -137,3 +137,17 @@ /* Mark that we don't need executable stack. */ .section .note.GNU-stack,"",%progbits diff --git a/0035-src-CMakeLists.txt.patch b/0035-src-CMakeLists.txt.patch deleted file mode 100644 index 466e2b0..0000000 --- a/0035-src-CMakeLists.txt.patch +++ /dev/null @@ -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_link_libraries(krbd keyutils::keyutils) -+ add_dependencies(krbd legacy-option-headers) - endif() - add_subdirectory(librbd) - if(WITH_FUSE) diff --git a/0044_src_cpp_redis_CMakeLists.txt.patch b/0044_src_cpp_redis_CMakeLists.txt.patch deleted file mode 100644 index c91be22..0000000 --- a/0044_src_cpp_redis_CMakeLists.txt.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ceph-19.1.0/src/cpp_redis/CMakeLists.txt.orig 2024-07-11 15:16:22.487082035 -0400 -+++ ceph-19.1.0/src/cpp_redis/CMakeLists.txt 2024-07-11 15:17:57.226534456 -0400 -@@ -174,6 +174,7 @@ - set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}") - endif(USE_CUSTOM_TCP_CLIENT) - -+install(TARGETS ${PROJECT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ceph) - - ### - # examples ---- ceph-19.1.0/src/cpp_redis/tacopie/CMakeLists.txt.orig 2024-01-30 21:47:59.000000000 -0500 -+++ ceph-19.1.0/src/cpp_redis/tacopie/CMakeLists.txt 2024-07-12 07:37:23.584654640 -0400 -@@ -162,6 +162,8 @@ - ENDIF(SELECT_TIMEOUT) - - -+install(TARGETS ${PROJECT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/ceph) -+ - ### - # examples - ### diff --git a/0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch b/0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch deleted file mode 100644 index 2d853e5..0000000 --- a/0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ceph-19.1.0/src/common/crc32c_ppc_fast_zero_asm.S.orig 2024-07-26 07:18:50.733484175 -0400 -+++ ceph-19.1.0/src/common/crc32c_ppc_fast_zero_asm.S 2024-07-26 07:17:48.449531183 -0400 -@@ -45,8 +45,10 @@ - - /* unsigned int barrett_reduction(unsigned long val) */ - FUNC_START(barrett_reduction) -- lis r4,.constants@ha -- la r4,.constants@l(r4) -+/* lis r4,.constants@ha */ -+/* la r4,.constants@l(r4) */ -+ addis r4,r4,.constants@toc@ha -+ addi r4,r4,.constants@toc@l - - li r5,16 - vxor v1,v1,v1 /* zero v1 */ -@@ -83,8 +85,10 @@ - - /* unsigned int barrett_reduction_reflected(unsigned long val) */ - FUNC_START(barrett_reduction_reflected) -- lis r4,.bit_reflected_constants@ha -- la r4,.bit_reflected_constants@l(r4) -+/* lis r4,.bit_reflected_constants@ha */ -+/* la r4,.bit_reflected_constants@l(r4) */ -+ addis r4,r4,.bit_reflected_constants@toc@ha -+ addi r4,r4,.bit_reflected_constants@toc@l - - li r5,16 - vxor v1,v1,v1 /* zero v1 */ diff --git a/0047-openssl-no-engine.patch b/0047-openssl-no-engine.patch index 3c2db95..3d5f616 100644 --- a/0047-openssl-no-engine.patch +++ b/0047-openssl-no-engine.patch @@ -1,44 +1,3 @@ -diff --git a/src/common/openssl_opts_handler.cc b/src/common/openssl_opts_handler.cc -index 81d0c4786..d9866f197 100644 ---- a/src/common/openssl_opts_handler.cc -+++ b/src/common/openssl_opts_handler.cc -@@ -16,7 +16,10 @@ - - #include - #include -+#include -+#ifndef OPENSSL_NO_ENGINE - #include -+#endif - #include - #include - #include -@@ -116,11 +119,13 @@ void load_module(const string &engine_conf) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -+#ifndef OPENSSL_NO_ENGINE - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wdeprecated-declarations" - ENGINE_load_builtin_engines(); - #pragma clang diagnostic pop - #pragma GCC diagnostic pop -+#endif - - if (CONF_modules_load( - conf, nullptr, -diff --git a/src/crypto/openssl/openssl_crypto_accel.cc b/src/crypto/openssl/openssl_crypto_accel.cc -index f99844a38..4944205dd 100644 ---- a/src/crypto/openssl/openssl_crypto_accel.cc -+++ b/src/crypto/openssl/openssl_crypto_accel.cc -@@ -14,7 +14,6 @@ - - #include "crypto/openssl/openssl_crypto_accel.h" - #include --#include - #include "common/debug.h" - - // ----------------------------------------------------------------------------- diff --git a/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c b/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c index fea9e6f98..c7eddb20b 100644 --- a/src/jaegertracing/opentelemetry-cpp/third_party/prometheus-cpp/3rdparty/civetweb/src/civetweb.c diff --git a/0054-cmake-4.patch b/0054-cmake-4.patch deleted file mode 100644 index 1b28bb8..0000000 --- a/0054-cmake-4.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ceph-19.2.1/src/cpp_redis/CMakeLists.txt.orig 2025-03-01 06:02:26.445691012 -0500 -+++ ceph-19.2.1/src/cpp_redis/CMakeLists.txt 2025-03-01 06:02:51.261243247 -0500 -@@ -23,7 +23,6 @@ - ### - # config - ### --cmake_minimum_required(VERSION 2.8.7) - set(CMAKE_MACOSX_RPATH 1) - include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) - ---- ceph-19.2.1/src/cpp_redis/tacopie/CMakeLists.txt.orig 2025-03-01 06:40:40.147203851 -0500 -+++ ceph-19.2.1/src/cpp_redis/tacopie/CMakeLists.txt 2025-03-01 06:40:52.788980958 -0500 -@@ -23,7 +23,6 @@ - ### - # config - ### --cmake_minimum_required(VERSION 2.8.7) - set(CMAKE_MACOSX_RPATH 1) - include(${CMAKE_ROOT}/Modules/ExternalProject.cmake) - ---- ceph-19.2.1/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt.orig 2025-03-01 11:04:04.630843703 -0500 -+++ ceph-19.2.1/src/jaegertracing/opentelemetry-cpp/CMakeLists.txt 2025-03-01 13:08:27.186470226 -0500 -@@ -1,8 +1,8 @@ --cmake_minimum_required(VERSION 3.1) - - # See https://cmake.org/cmake/help/v3.3/policy/CMP0057.html required by certain - # versions of gtest - cmake_policy(SET CMP0057 NEW) -+cmake_minimum_required(VERSION 3.12) - - # See https://cmake.org/cmake/help/v3.12/policy/CMP0074.html required by certain - # version of zlib which is dependeded by cURL. diff --git a/0055-python314.patch b/0055-python314.patch deleted file mode 100644 index d7b7070..0000000 --- a/0055-python314.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- ceph-19.2.2/src/pybind/cephfs/setup.py.orig 2025-05-29 15:51:00.656323008 -0400 -+++ ceph-19.2.2/src/pybind/cephfs/setup.py 2025-05-29 15:52:13.215102123 -0400 -@@ -1,11 +1,11 @@ - import os --import pkgutil -+import importlib.util - import shutil - import subprocess - import sys - import tempfile - import textwrap --if not pkgutil.find_loader('setuptools'): -+if not importlib.util.find_spec('setuptools'): - from distutils.core import setup - from distutils.extension import Extension - else: ---- ceph-19.2.2/src/pybind/rbd/setup.py.orig 2025-05-29 15:48:35.863759314 -0400 -+++ ceph-19.2.2/src/pybind/rbd/setup.py 2025-05-29 15:50:05.529742462 -0400 -@@ -1,11 +1,11 @@ - import os --import pkgutil -+import importlib.util - import shutil - import subprocess - import sys - import tempfile - import textwrap --if not pkgutil.find_loader('setuptools'): -+if not importlib.util.find_spec('setuptools'): - from distutils.core import setup - from distutils.extension import Extension - else: ---- ceph-19.2.2/src/pybind/rgw/setup.py.orig 2025-05-29 15:44:13.673781032 -0400 -+++ ceph-19.2.2/src/pybind/rgw/setup.py 2025-05-29 15:48:23.444285313 -0400 -@@ -1,5 +1,5 @@ --import pkgutil --if not pkgutil.find_loader('setuptools'): -+import importlib.util -+if not importlib.util.find_spec('setuptools'): - from distutils.core import setup - from distutils.extension import Extension - else: ---- ceph-19.2.2/src/pybind/rados/setup.py.orig 2025-05-29 15:50:14.768095133 -0400 -+++ ceph-19.2.2/src/pybind/rados/setup.py 2025-05-29 15:50:46.003687955 -0400 -@@ -1,5 +1,5 @@ --import pkgutil --if not pkgutil.find_loader('setuptools'): -+import importlib.util -+if not importlib.util.find_spec('setuptools'): - from distutils.core import setup - from distutils.extension import Extension - else: diff --git a/0056-libarrow-20.0.0.patch b/0056-libarrow-20.0.0.patch index d533f82..12cb9cf 100644 --- a/0056-libarrow-20.0.0.patch +++ b/0056-libarrow-20.0.0.patch @@ -1,6 +1,5 @@ -diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal_19.h ceph-19.2.2/src/s3select/include/encryption_internal_19.h ---- ceph-19.2.2/src/s3select.orig/include/encryption_internal_19.h 2025-07-07 13:17:09.262618668 -0400 -+++ ceph-19.2.2/src/s3select/include/encryption_internal_19.h 2025-07-07 13:08:00.746355226 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal_19.h.orig 2025-07-08 07:40:29.811814549 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal_19.h 2025-07-08 07:40:29.811739290 -0400 @@ -0,0 +1,114 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file @@ -116,9 +115,8 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal_19.h ceph-19. + +} // namespace encryption +} // namespace parquet -diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal_20.h ceph-19.2.2/src/s3select/include/encryption_internal_20.h ---- ceph-19.2.2/src/s3select.orig/include/encryption_internal_20.h 2025-07-07 13:17:09.262618668 -0400 -+++ ceph-19.2.2/src/s3select/include/encryption_internal_20.h 2025-07-07 13:08:00.746536155 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal_20.h.orig 2025-07-08 07:40:29.812759948 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal_20.h 2025-07-08 07:40:29.812687536 -0400 @@ -0,0 +1,141 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file @@ -261,9 +259,8 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal_20.h ceph-19. +void EnsureBackendInitialized(); + +} // namespace parquet::encryption -diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal.h ceph-19.2.2/src/s3select/include/encryption_internal.h ---- ceph-19.2.2/src/s3select.orig/include/encryption_internal.h 2024-03-26 19:23:12.000000000 -0400 -+++ ceph-19.2.2/src/s3select/include/encryption_internal.h 2025-07-07 13:08:00.745633149 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal.h.orig 2024-10-06 07:18:41.000000000 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/encryption_internal.h 2025-07-08 07:40:29.809908891 -0400 @@ -17,98 +17,8 @@ #pragma once @@ -368,9 +365,8 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/encryption_internal.h ceph-19.2.2 +#else +#include "encryption_internal_20.h" +#endif -diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_19.h ceph-19.2.2/src/s3select/include/internal_file_decryptor_19.h ---- ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_19.h 2025-07-07 13:17:58.730837390 -0400 -+++ ceph-19.2.2/src/s3select/include/internal_file_decryptor_19.h 2025-07-07 13:08:00.746893764 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor_19.h.orig 2025-07-08 07:40:29.814292389 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor_19.h 2025-07-08 07:40:29.813727465 -0400 @@ -0,0 +1,121 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file @@ -493,9 +489,8 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_19.h ceph +}; + +} // namespace parquet -diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_20.h ceph-19.2.2/src/s3select/include/internal_file_decryptor_20.h ---- ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_20.h 2025-07-07 13:17:58.730837390 -0400 -+++ ceph-19.2.2/src/s3select/include/internal_file_decryptor_20.h 2025-07-07 13:08:00.747082281 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor_20.h.orig 2025-07-08 07:40:29.815411998 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor_20.h 2025-07-08 07:40:29.815245155 -0400 @@ -0,0 +1,148 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file @@ -645,9 +640,8 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor_20.h ceph + int16_t column_ordinal, int8_t module_type); + +} // namespace parquet -diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor.h ceph-19.2.2/src/s3select/include/internal_file_decryptor.h ---- ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor.h 2024-03-26 19:23:12.000000000 -0400 -+++ ceph-19.2.2/src/s3select/include/internal_file_decryptor.h 2025-07-07 13:08:00.746720961 -0400 +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor.h.orig 2024-10-06 07:18:41.000000000 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/internal_file_decryptor.h 2025-07-08 07:40:29.813623143 -0400 @@ -17,105 +17,8 @@ #pragma once @@ -759,10 +753,9 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/internal_file_decryptor.h ceph-19 +#else +#include "internal_file_decryptor_20.h" +#endif -diff -ur ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h ceph-19.2.2/src/s3select/include/s3select_parquet_intrf.h ---- ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h 2024-03-26 19:23:12.000000000 -0400 -+++ ceph-19.2.2/src/s3select/include/s3select_parquet_intrf.h 2025-07-07 13:08:00.747275733 -0400 -@@ -983,6 +1002,7 @@ +--- ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/s3select_parquet_intrf.h.orig 2024-10-06 07:18:41.000000000 -0400 ++++ ceph-20.0.0-2362-ga9d20fc0/src/s3select/include/s3select_parquet_intrf.h 2025-07-08 07:40:29.816727417 -0400 +@@ -1002,6 +1002,7 @@ throw ParquetException("Encrypted files cannot contain more than 32767 row groups"); } @@ -770,7 +763,7 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h ceph-19. // The column is encrypted std::shared_ptr<::parquet::Decryptor> meta_decryptor; std::shared_ptr data_decryptor; -@@ -1016,6 +1036,25 @@ +@@ -1035,6 +1036,25 @@ false, #endif properties_.memory_pool(), &ctx); @@ -796,7 +789,7 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h ceph-19. } private: -@@ -1052,7 +1091,9 @@ +@@ -1071,7 +1091,9 @@ } void Close() override { @@ -806,7 +799,7 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h ceph-19. } std::shared_ptr GetRowGroup(int i) override { -@@ -1230,9 +1271,17 @@ +@@ -1249,9 +1271,17 @@ // Handle AAD prefix EncryptionAlgorithm algo = file_crypto_metadata->encryption_algorithm(); std::string file_aad = HandleAadPrefix(file_decryption_properties, algo); @@ -824,7 +817,7 @@ diff -ur ceph-19.2.2/src/s3select.orig/include/s3select_parquet_intrf.h ceph-19. int64_t metadata_offset = source_size_ - kFooterSize - footer_len + crypto_metadata_len; uint32_t metadata_len = footer_len - crypto_metadata_len; -@@ -1259,9 +1312,18 @@ +@@ -1282,9 +1312,18 @@ EncryptionAlgorithm algo = file_metadata_->encryption_algorithm(); // Handle AAD prefix std::string file_aad = HandleAadPrefix(file_decryption_properties, algo); diff --git a/ceph-c99-2.patch b/ceph-c99-2.patch deleted file mode 100644 index bbce9d3..0000000 --- a/ceph-c99-2.patch +++ /dev/null @@ -1,178 +0,0 @@ -commit a49d154f4a8e493baf2296a15c7b5c56cd25e993 -Author: Florian Weimer -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 - -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 "": -+ 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 "": -+ 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 = 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, diff --git a/ceph.spec b/ceph.spec index fd3c86f..ff508ed 100644 --- a/ceph.spec +++ b/ceph.spec @@ -67,15 +67,11 @@ %bcond_with rbd_rwl_cache %endif %if 0%{?fedora} || 0%{?rhel} -%if 0%{?rhel} < 9 -%bcond_with system_pmdk -%else %ifarch s390x %{arm64} riscv64 %bcond_with system_pmdk %else %bcond_without system_pmdk %endif -%endif %bcond_without selinux %bcond_without amqp_endpoint %bcond_without kafka_endpoint @@ -123,20 +119,20 @@ %bcond_with lua_packages %endif %endif -%bcond_with seastar +%bcond_with crimson %if 0%{?suse_version} %bcond_with jaeger %else %bcond_without jaeger %endif -%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 10 +%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} # distros that ship cmd2 and/or colorama %bcond_without cephfs_shell %else # distros that do _not_ ship cmd2/colorama %bcond_with cephfs_shell %endif -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %bcond_without system_arrow %bcond_without system_utf8proc %else @@ -147,15 +143,17 @@ %endif # qat only supported for intel devices %ifarch x86_64 -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %bcond_without system_qat %else +# not fedora/rhel %bcond_with system_qat %endif %else +# not x86_64 %bcond_with system_qat %endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %global weak_deps 1 %endif %endif @@ -170,13 +168,23 @@ %endif %bcond_with cephadm_bundling %bcond_without cephadm_pip_deps +%bcond_without dwz +%if %{with dwz} +%else +# disable dwz for 50% speedup at the cost of ~33% space +%global _find_debuginfo_dwz_opts %{nil} +%endif +%bcond_with sccache %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} -%{!?gts_prefix: %global gts_prefix gcc-toolset-11} +%if 0%{with crimson} +%{!?gts_version: %global gts_version 13} +%else +%endif %define _lto_cflags %{nil} %if ! 0%{?suse_version} @@ -217,7 +225,7 @@ # main package definition ################################################################################# Name: ceph -Version: 19.2.3 +Version: 20.1.0 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -234,30 +242,23 @@ Group: System/Filesystems %endif URL: http://ceph.com/ Source0: https://download.ceph.com/tarballs/ceph-%{version}.tar.gz -#Source0: https://1.chacra.ceph.com/r/ceph/quincy/ -Patch0001: 0001-src-common-crc32c_intel_fast.patch -Patch0003: 0003-src-common-bitstr.h.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 -Patch0016: 0016-src-tracing-patch -Patch0018: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch -Patch0024: 0024-gcc-13.patch -Patch0029: 0029-src-rgw-rgw_amqp.cc.patch -Patch0032: 0032-cmake-modules-BuildBoost.cmake.patch -Patch0033: 0033-boost-asm.patch -Patch0034: 0034-src-pybind-rbd-rbd.pyx.patch -Patch0035: 0035-src-CMakeLists.txt.patch -Patch0040: 0040-gcc-14.patch -Patch0041: 0041-src-mgr-PyModule.cc.patch -Patch0043: 0043_src_common_crc32c_ppc_asm.S.patch -Patch0044: 0044_src_cpp_redis_CMakeLists.txt.patch -Patch0045: 0045_src-commom-crc32c_ppc_fast_zero_asm.S.patch -Patch0047: 0047-openssl-no-engine.patch -Patch0049: 0049-src-rocksdb-db-blob-blob_file_meta.h.patch -Patch0054: 0054-cmake-4.patch -Patch0055: 0055-python314.patch -Patch0056: 0056-libarrow-20.0.0.patch +#Source0: https://1.chacra.ceph.com/r/ceph/tentacle/ +Patch: 0001-src-common-crc32c_intel_fast.patch +Patch: 0003-src-common-bitstr.h.patch +Patch: 0010-CET-Add-CET-marker-to-crc32c_intel_fast_zero_asm.s.patch +Patch: 0011-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assembly-co.patch +Patch: 0012-spdk-isa-l-CET-Add-CET-marker-to-x86-64-crc32-assemb.patch +Patch: 0016-src-tracing-patch +Patch: 0018-src-rgw-store-dbstore-CMakeLists.txt.patch +Patch: 0024-gcc-13.patch +Patch: 0032-cmake-modules-BuildBoost.cmake.patch +Patch: 0033-boost-asm.patch +Patch: 0034-src-pybind-rbd-rbd.pyx.patch +Patch: 0041-src-mgr-PyModule.cc.patch +Patch: 0043_src_common_crc32c_ppc_asm.S.patch +Patch: 0047-openssl-no-engine.patch +Patch: 0049-src-rocksdb-db-blob-blob_file_meta.h.patch +Patch: 0056-libarrow-20.0.0.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -285,41 +286,28 @@ BuildRequires: selinux-policy-devel BuildRequires: gperf BuildRequires: cmake > 3.5 BuildRequires: fuse3-devel -%if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} >= 9 +BuildRequires: grpc-devel +%if 0%{?fedora} || 0%{?suse_version} > 1500 || 0%{?rhel} BuildRequires: gcc-c++ >= 11 %endif %if 0%{?suse_version} == 1500 BuildRequires: gcc11-c++ %endif -%if 0%{?rhel} == 8 -BuildRequires: %{gts_prefix}-gcc-c++ -BuildRequires: %{gts_prefix}-build -BuildRequires: %{gts_prefix}-libatomic-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} BuildRequires: libatomic -BuildRequires: gcc-c++ %endif -%if 0%{?rhel} -%bcond_with ld_mold -%else %ifarch x86_64 aarch64 -%bcond_without ld_mold +%bcond_with ld_mold %else %bcond_with ld_mold %endif -%endif %if 0%{with ld_mold} BuildRequires: mold %endif %if 0%{with tcmalloc} # libprofiler did not build on ppc64le until 2.7.90 -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} BuildRequires: gperftools-devel >= 2.7.90 -BuildRequires: libunwind-devel -%endif -%if 0%{?rhel} && 0%{?rhel} < 8 -BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} BuildRequires: gperftools-devel >= 2.4 @@ -345,9 +333,8 @@ BuildRequires: liboath-devel %endif BuildRequires: libtool BuildRequires: libxml2-devel -BuildRequires: libzstd-devel -BuildRequires: ninja-build BuildRequires: ncurses-devel +BuildRequires: make BuildRequires: libicu-devel BuildRequires: patch BuildRequires: perl @@ -357,7 +344,6 @@ BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-Cython -BuildRequires: python%{python3_pkgversion}-markupsafe BuildRequires: snappy-devel BuildRequires: sqlite-devel BuildRequires: sudo @@ -371,7 +357,7 @@ BuildRequires: xmlstarlet BuildRequires: nasm BuildRequires: lua-devel BuildRequires: lmdb-devel -%if 0%{with seastar} || 0%{with jaeger} +%if 0%{with crimson} || 0%{with jaeger} BuildRequires: yaml-cpp-devel >= 0.6 %endif %if 0%{with amqp_endpoint} @@ -381,7 +367,7 @@ BuildRequires: librabbitmq-devel BuildRequires: librdkafka-devel %endif %if 0%{with lua_packages} -BuildRequires: lua-devel +Requires: lua-devel Requires: %{luarocks_package_name} %endif %if 0%{with make_check} @@ -389,7 +375,6 @@ BuildRequires: hostname BuildRequires: jq BuildRequires: libuuid-devel BuildRequires: python%{python3_pkgversion}-bcrypt -BuildRequires: python%{python3_pkgversion}-pecan BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-dateutil BuildRequires: python%{python3_pkgversion}-coverage @@ -429,13 +414,17 @@ BuildRequires: libpmemobj-devel >= 1.8 %if 0%{with system_arrow} BuildRequires: libarrow-devel BuildRequires: parquet-libs-devel +%else +BuildRequires: xsimd-devel +%endif +%if 0%{with system_utf8proc} BuildRequires: utf8proc-devel %endif %if 0%{with system_qat} BuildRequires: qatlib-devel BuildRequires: qatzip-devel %endif -%if 0%{with seastar} +%if 0%{with crimson} BuildRequires: c-ares-devel BuildRequires: gnutls-devel BuildRequires: hwloc-devel @@ -445,15 +434,19 @@ BuildRequires: ragel BuildRequires: systemtap-sdt-devel BuildRequires: libubsan BuildRequires: libasan +%if 0%{?gts_version} > 0 +%if 0%{?gts_version} >= 12 +BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin +%else +BuildRequires: gcc-toolset-%{gts_version}-annobin +BuildRequires: gcc-toolset-%{gts_version}-annobin-plugin-gcc +%endif +BuildRequires: gcc-toolset-%{gts_version}-libubsan-devel +BuildRequires: gcc-toolset-%{gts_version}-libasan-devel +%endif +%endif BuildRequires: protobuf-devel BuildRequires: protobuf-compiler -%if 0%{?rhel} == 8 -BuildRequires: %{gts_prefix}-annobin -BuildRequires: %{gts_prefix}-annobin-plugin-gcc -BuildRequires: %{gts_prefix}-libubsan-devel -BuildRequires: %{gts_prefix}-libasan-devel -%endif -%endif ################################################################################# # distro-conditional dependencies ################################################################################# @@ -485,14 +478,15 @@ BuildRequires: jsonnet %endif %if 0%{?fedora} || 0%{?rhel} Requires: systemd -BuildRequires: boost-devel BuildRequires: boost-random BuildRequires: nss-devel BuildRequires: keyutils-libs-devel BuildRequires: libatomic BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel +BuildRequires: ninja-build BuildRequires: openldap-devel +BuildRequires: numactl-devel #BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: CUnit-devel @@ -518,7 +512,6 @@ BuildRequires: xmlsec1-openssl-devel BuildRequires: python%{python3_pkgversion}-cherrypy BuildRequires: python%{python3_pkgversion}-routes BuildRequires: python%{python3_pkgversion}-scipy -BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif BuildRequires: jsonnet @@ -529,7 +522,6 @@ BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 BuildRequires: python%{python3_pkgversion}-CherryPy BuildRequires: python%{python3_pkgversion}-Routes -BuildRequires: python%{python3_pkgversion}-Werkzeug BuildRequires: python%{python3_pkgversion}-numpy-devel BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-openssl-devel @@ -549,17 +541,16 @@ BuildRequires: babeltrace-devel %if 0%{?suse_version} BuildRequires: libexpat-devel %endif -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: expat-devel %endif #hardened-cc1 %if 0%{?fedora} || 0%{?rhel} BuildRequires: redhat-rpm-config %endif -%if 0%{with seastar} +%if 0%{with crimson} %if 0%{?fedora} || 0%{?rhel} BuildRequires: cryptopp-devel -BuildRequires: numactl-devel %endif %if 0%{?suse_version} BuildRequires: libcryptopp-devel @@ -697,6 +688,17 @@ system. One or more instances of ceph-mon form a Paxos part-time parliament cluster that provides extremely reliable and durable storage of cluster membership, configuration, and state. +%package mon-client-nvmeof +Summary: Ceph NVMeoF Gateway Monitor Client +%if 0%{?suse_version} +Group: System/Filesystems +%endif +Provides: ceph-test:/usr/bin/ceph-nvmeof-monitor-client +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +%description mon-client-nvmeof +Ceph NVMeoF Gateway Monitor Client distributes Paxos ANA info +to NVMeoF Gateway and provides beacons to the monitor daemon + %package mgr Summary: Ceph Manager Daemon %if 0%{?suse_version} @@ -727,19 +729,18 @@ 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} >= 9 +%if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-grpcio Requires: python%{python3_pkgversion}-grpcio-tools +Requires: python%{python3_pkgversion}-jmespath Requires: python%{python3_pkgversion}-xmltodict %endif %if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-routes -Requires: python%{python3_pkgversion}-werkzeug %if 0%{?weak_deps} Recommends: python%{python3_pkgversion}-saml -%if 0%{?fedora} || 0%{?rhel} <= 8 +%if 0%{?fedora} Recommends: python%{python3_pkgversion}-grpcio Recommends: python%{python3_pkgversion}-grpcio-tools %endif @@ -748,7 +749,6 @@ Recommends: python%{python3_pkgversion}-grpcio-tools %if 0%{?suse_version} Requires: python%{python3_pkgversion}-CherryPy Requires: python%{python3_pkgversion}-Routes -Requires: python%{python3_pkgversion}-Werkzeug Recommends: python%{python3_pkgversion}-python3-saml %endif %description mgr-dashboard @@ -781,20 +781,17 @@ Group: System/Filesystems %endif Requires: python%{python3_pkgversion}-bcrypt Requires: python%{python3_pkgversion}-packaging -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 +%if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-cherrypy Requires: python%{python3_pkgversion}-pyyaml -Requires: python%{python3_pkgversion}-werkzeug %endif %if 0%{?suse_version} Requires: python%{python3_pkgversion}-CherryPy Requires: python%{python3_pkgversion}-PyYAML -Requires: python%{python3_pkgversion}-Werkzeug %endif %if 0%{?weak_deps} Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} @@ -975,11 +972,10 @@ Summary: Ceph Object Storage Daemon %if 0%{?suse_version} Group: System/Filesystems %endif -Provides: ceph-test:/usr/bin/ceph-osdomap-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: sudo Requires: libstoragemgmt -%if 0%{with seastar} +%if 0%{with crimson} Requires: protobuf %endif %if 0%{?weak_deps} @@ -990,7 +986,7 @@ ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system and providing access to them over the network. -%if 0%{with seastar} +%if 0%{with crimson} %package crimson-osd Summary: Ceph Object Storage Daemon (crimson) %if 0%{?suse_version} @@ -1231,18 +1227,40 @@ Obsoletes: libcephfs1 < %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-libcephfs < %{_epoch_prefix}%{version}-%{release} %endif +Recommends: libcephfs-proxy2 = %{_epoch_prefix}%{version}-%{release} %description -n libcephfs2 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. This is a shared library allowing applications to access a Ceph distributed file system via a POSIX-like interface. +%package -n libcephfs-proxy2 +Summary: Proxy for libcephfs +%if 0%{?suse_version} +Group: System/Libraries +%endif +Recommends: libcephfs-daemon = %{_epoch_prefix}%{version}-%{release} +%description -n libcephfs-proxy2 +This package contains the libcephfs_proxy.so library that allow applications +to share cephfs mounts to reduce resource consumption. + +%package -n libcephfs-daemon +Summary: Deamon for the libcephfs proxy +%if 0%{?suse_version} +Group: System/Filesystems +%endif +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +%description -n libcephfs-daemon +This package contains the libcephfsd daemon that allows applications to share +cephfs mounts to reduce resource consumption. + %package -n libcephfs-devel Summary: Ceph distributed file system headers %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs-proxy2 = %{_epoch_prefix}%{version}-%{release} Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} @@ -1280,7 +1298,7 @@ descriptions, and submitting the command to the appropriate daemon. %package -n python%{python3_pkgversion}-ceph-common Summary: Python 3 utility libraries for Ceph -%if 0%{?fedora} || 0%{?rhel} >= 8 +%if 0%{?fedora} || 0%{?rhel} Requires: python%{python3_pkgversion}-pyyaml %endif %if 0%{?suse_version} @@ -1316,8 +1334,6 @@ Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: xmlstarlet Requires: jq Requires: socat -BuildRequires: gtest-devel -BuildRequires: gmock-devel %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -1457,7 +1473,7 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" -%if 0%{with seastar} +%if 0%{with crimson} # seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk() export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') # remove from CFLAGS too because it causes the arrow submodule to fail with: @@ -1548,15 +1564,15 @@ env | sort %if 0%{without jaeger} -DWITH_JAEGER:BOOL=OFF \ %endif -%if 0%{with ceph_test_package} - -DWITH_SYSTEM_GTEST:BOOL=ON \ -%endif - -DWITH_SYSTEM_ZSTD:BOOL=ON \ %if 0%{?fedora} || 0%{?rhel} -DWITH_FMT_HEADER_ONLY:BOOL=ON \ %endif %if 0%{with system_arrow} -DWITH_SYSTEM_ARROW:BOOL=ON \ +%else + -Dxsimd_SOURCE="SYSTEM" \ +%endif +%if 0%{with system_utf8proc} -DWITH_SYSTEM_UTF8PROC:BOOL=ON \ %endif %ifarch x86_64 aarch64 @@ -1572,9 +1588,16 @@ env | sort %if 0%{with ld_mold} -DCMAKE_LINKER=%{_bindir}/ld.mold \ %endif -%if 0%{with seastar} - -DWITH_SEASTAR:BOOL=ON \ +%if 0%{with crimson} + -DWITH_CRIMSON:BOOL=ON \ -DWITH_JAEGER:BOOL=OFF \ +%endif + -DWITH_GRAFANA:BOOL=ON \ +%if %{with sccache} + -DWITH_SCCACHE=ON \ +%endif +%ifarch aarch64 + -DWITH_UADK:BOOL=OFF \ %endif %if 0%{with cephadm_bundling} %if 0%{with cephadm_pip_deps} @@ -1625,7 +1648,7 @@ export GCC_COLORS= # we have dropped sysvinit bits rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph -%if 0%{with seastar} +%if 0%{with crimson} # package crimson-osd with the name of ceph-osd install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd %endif @@ -1768,6 +1791,9 @@ rm -f %{buildroot}%{_mandir}/man8/ceph-mon.8* rm -f %{buildroot}%{_unitdir}/ceph-mon@.service rm -f %{buildroot}%{_unitdir}/ceph-mon.target +# Remove the ceph-mon-client-nvmeof package +rm -f %{buildroot}%{_bindir}/ceph-nvmeof-monitor-client + # Remove the ceph-radosgw package rm -f %{buildroot}%{_unitdir}/ceph-radosgw@.service rm -f %{buildroot}%{_unitdir}/ceph-radosgw.target @@ -1786,9 +1812,6 @@ rm -f %{buildroot}%{_mandir}/man8/ceph-bluestore-tool.8* rm -f %{buildroot}%{_unitdir}/ceph-osd@.service rm -f %{buildroot}%{_unitdir}/ceph-osd.target -# Remove ceph-exporter -rm -f %{buildroot}%{_unitdir}/ceph-exporter.service - # Remove rbd-mirror rm -f %{buildroot}%{_bindir}/rbd-mirror rm -f %{buildroot}%{_mandir}/man8/rbd-mirror.8* @@ -1820,6 +1843,9 @@ rm -f %{buildroot}%{_mandir}/man8/cephfs-mirror.8* rm -f %{buildroot}%{_unitdir}/cephfs-mirror@.service rm -f %{buildroot}%{_unitdir}/cephfs-mirror.target +# Remove ceph-exporter +rm -rf %{buildroot}%{_unitdir}/ceph-exporter.service + # Remove cephadm rm -f %{buildroot}%{_sbindir}/cephadm rm -f %{buildroot}%{_mandir}/man8/cephadm.8* @@ -1833,10 +1859,6 @@ rm -f %{buildroot}%{_mandir}/man8/cephadm.8* %fdupes %{buildroot}%{_prefix} %endif -%if 0%{?rhel} == 8 || 0%{?fedora} >= 33 -%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib} -%endif - ################################################################################# # files and systemd scriptlets ################################################################################# @@ -2204,9 +2226,9 @@ fi %{_datadir}/ceph/mgr/progress %{_datadir}/ceph/mgr/prometheus %{_datadir}/ceph/mgr/rbd_support -%{_datadir}/ceph/mgr/restful %{_datadir}/ceph/mgr/rgw %{_datadir}/ceph/mgr/selftest +%{_datadir}/ceph/mgr/smb %{_datadir}/ceph/mgr/snap_schedule %{_datadir}/ceph/mgr/stats %{_datadir}/ceph/mgr/status @@ -2214,7 +2236,6 @@ fi %{_datadir}/ceph/mgr/telemetry %{_datadir}/ceph/mgr/test_orchestrator %{_datadir}/ceph/mgr/volumes -%{_datadir}/ceph/mgr/zabbix %files mgr-rook %{_datadir}/ceph/mgr/rook @@ -2298,6 +2319,9 @@ if [ $1 -ge 1 ] ; then fi fi +%files mon-client-nvmeof +%{_bindir}/ceph-nvmeof-monitor-client + %files fuse %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* @@ -2499,7 +2523,6 @@ fi %{_bindir}/ceph-bluestore-tool %{_bindir}/ceph-erasure-code-tool %{_bindir}/ceph-objectstore-tool -%{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osd %{_libexecdir}/ceph/ceph-osd-prestart.sh %{_mandir}/man8/ceph-clsinfo.8* @@ -2517,16 +2540,12 @@ if [ $1 -eq 1 ] ; then fi %endif %if 0%{?fedora} || 0%{?rhel} -%systemd_post ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target +%systemd_post ceph-osd@\*.service ceph-osd.target %endif if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : fi -%if 0%{?sysctl_apply} - %sysctl_apply 90-ceph-osd.conf -%else - /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || : -%endif +%sysctl_apply 90-ceph-osd.conf %preun osd %if 0%{?suse_version} @@ -2550,7 +2569,7 @@ if [ $1 -ge 1 ] ; then fi fi -%if 0%{with seastar} +%if 0%{with crimson} %files crimson-osd %{_bindir}/crimson-osd %endif @@ -2616,8 +2635,6 @@ fi %if %{with lttng} %{_libdir}/librados_tp.so.* %endif -%{_libdir}/ceph/libcpp_redis.so* -%{_libdir}/ceph/libtacopie.so* %dir %{_sysconfdir}/ceph %ldconfig_scriptlets librados2 @@ -2726,6 +2743,16 @@ fi %ldconfig_scriptlets libcephfs2 +%files -n libcephfs-proxy2 +%{_libdir}/libcephfs_proxy.so.* + +%post -n libcephfs-proxy2 -p /sbin/ldconfig + +%postun -n libcephfs-proxy2 -p /sbin/ldconfig + +%files -n libcephfs-daemon +%{_sbindir}/libcephfsd + %files -n libcephfs-devel %dir %{_includedir}/cephfs %{_includedir}/cephfs/libcephfs.h @@ -2734,6 +2761,8 @@ fi %dir %{_includedir}/cephfs/metrics %{_includedir}/cephfs/metrics/Types.h %{_libdir}/libcephfs.so +%{_libdir}/libcephfs_proxy.so +%{_libdir}/pkgconfig/cephfs.pc %files -n python%{python3_pkgversion}-cephfs %{python3_sitearch}/cephfs.cpython*.so @@ -2785,7 +2814,8 @@ fi %{_bindir}/ceph-coverage %{_bindir}/ceph-debugpack %{_bindir}/ceph-dedup-tool -%if 0%{with seastar} +%{_bindir}/ceph-dedup-daemon +%if 0%{with crimson} %{_bindir}/crimson-store-nbd %endif %{_mandir}/man8/ceph-debugpack.8* @@ -2946,11 +2976,8 @@ exit 0 %endif %changelog -* Mon Jul 28 2025 Kaleb S. KEITHLEY - 2:19.2.3-1 -- ceph-19.2.3 GA - -* Tue Jul 15 2025 Kaleb S. KEITHLEY - 2:19.2.2-2 -- ceph-19.2.2, rebuild with libarrow-20 and liborc-2.1.3 +* Tue Jul 8 2025 Kaleb S. KEITHLEY - 2:20.0.0 +- ceph-20.0.0 * Fri Apr 11 2025 Kaleb S. KEITHLEY - 2:19.2.2-1 - ceph-19.2.2 GA @@ -2972,86 +2999,3 @@ exit 0 * Fri Sep 20 2024 Kaleb S. KEITHLEY - 2:19.2.0-1 - ceph-19.2.0 GA - -* Thu Sep 5 2024 Kaleb S. KEITHLEY - 2:19.1.1-0.2 -- ceph-19.1.1, revert ppc64le asm change from rawhide rhbz#23093208 - -* Thu Aug 29 2024 Kaleb S. KEITHLEY - 2:19.1.1-0.1 -- ceph-19.1.1 RC - -* Fri Jul 12 2024 Kaleb S. KEITHLEY - 2:19.1.0-0.2 -- add libcpp_redis.so and libtacopie.so to librados2.rpm - -* Tue Jul 9 2024 Kaleb S. KEITHLEY - 2:19.1.0-0.1 -- ceph-19.1.0 RC - -* Mon Apr 29 2024 Kaleb S. KEITHLEY - 2:18.2.3-1 -- ceph-18.2.3 GA - -* Mon Apr 22 2024 Kaleb S. KEITHLEY - 2:18.2.2-4 -- rebuild with libarrow-16.0.0 - -* Tue Mar 19 2024 Kaleb S. KEITHLEY - 2:18.2.2-3 -- rebuild with libarrow-15.0.2 - -* Fri Mar 15 2024 Kaleb S. KEITHLEY - 2:18.2.2-2 -- rebuild with libarrow-15.0.1. (And liborc-2.0.0) - -* Thu Mar 7 2024 Kaleb S. KEITHLEY - 2:18.2.2-1 -- ceph-18.2.2 GA - -* Wed Jan 24 2024 Kaleb S. KEITHLEY - 2:18.2.1-3 -- gcc-14 - -* Tue Dec 19 2023 Kaleb S. KEITHLEY - 2:18.2.1-2 -- ceph-18.2.1, incorporate changes from *final* 18.2.1 release from - https://download.ceph.com/rpm-18.2.1/el9/SRPMS/ceph-18.2.1-0.el9.src.rpm - -* Wed Nov 15 2023 Kaleb S. KEITHLEY - 2:18.2.1-1 -- ceph-18.2.1 GA - -* Fri Aug 4 2023 Kaleb S. KEITHLEY - 2:18.2.0-1 -- ceph-18.2.0 GA - -* Wed Aug 2 2023 Kaleb S. KEITHLEY - 2:18.1.3-0.2 -- ceph-18.1.3 RC4, rebuild with libarrow-13.0.0 - -* Wed Jul 26 2023 Kaleb S. KEITHLEY - 2:18.1.3-0.1 -- ceph-18.1.3 RC4 - -* Fri Jul 21 2023 Fedora Release Engineering - 2:18.1.2-0.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -- revert python3-Cython -> python3dist(cython) < 3~~ - -* Wed Jul 19 2023 Fedora Release Engineering - 2:18.1.2-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -- with python3-Cython -> python3dist(cython) < 3~~ - -* Tue Jul 11 2023 František Zatloukal - 2:18.1.2-0.3 -- Rebuilt for ICU 73.2 - -* Fri Jun 30 2023 Kaleb S. KEITHLEY - 2:18.1.2-0.2 -- Rebuilt for Python 3.12 - -* Fri Jun 30 2023 Kaleb S. KEITHLEY - 2:18.1.2-0.1 -- ceph-18.1.2 RC3 - -* Sun Jun 18 2023 Kaleb S. KEITHLEY - 2:18.1.1-0.2 -- Rebuilt for Python 3.12 - -* Sun Jun 18 2023 Kaleb S. KEITHLEY - 2:18.1.1-0.1 -- ceph-18.1.1 RC2 - -* Thu Jun 15 2023 Kaleb S. KEITHLEY - 2:18.1.0-0.4 -- Rebuilt for Python 3.12 - -* Thu Jun 15 2023 Kaleb S. KEITHLEY - 2:18.1.0-0.3 -- remove requires for nonexistant libjaeger, rhbz#2215320 -- sync w/ upstream ceph.spec(.in), sanity check - -* Thu Jun 15 2023 Python Maint - 2:18.1.0-0.2 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Kaleb S. KEITHLEY - 2:18.1.0-0.1 -- ceph-18.1.0 RC1 - diff --git a/sources b/sources index c4baa17..858dda2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ceph-19.2.3.tar.gz) = 278101d2df7bed5363b20c2b065d7a7b26252c8164511257e213ffaa58d509015558183de10bc9281bcbe4d9f85244bcac5bba4db9823e28df6a96d0b687d00a +SHA512 (ceph-20.1.0.tar.gz) = 75f29e00754f1b136e3c976a9a50777d173eff23aa99aed416eff983f172bae72749e249f91bdc1d56685616a89c2d5621090fb27ecd59168ed36ea75723d6aa