[packages/ceph] Update to 19.2.1
arekm
arekm at pld-linux.org
Sun Mar 16 13:10:08 CET 2025
commit ecc6e94270a0cc846e8e0e7b8f4b4d5eb32259c0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Mar 16 12:16:20 2025 +0100
Update to 19.2.1
ceph-gcc14.patch | 141 -------------------------------------------------------
ceph.spec | 13 ++---
2 files changed, 7 insertions(+), 147 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index bfde265..f6e88e7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -54,12 +54,12 @@
Summary: User space components of the Ceph file system
Summary(pl.UTF-8): Działające w przestrzeni użytkownika elementy systemu plików Ceph
Name: ceph
-Version: 19.2.0
-Release: 6
+Version: 19.2.1
+Release: 1
License: LGPL v2.1 (libraries), GPL v2 (some programs)
Group: Base
Source0: http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
-# Source0-md5: 876d7144df5c7061ddbd5bc5c3709a35
+# Source0-md5: a9647a5303269e1389c8b0ad28beaa5c
Source1: %{name}.sysconfig
Source3: %{name}.tmpfiles
Patch0: %{name}-python.patch
@@ -75,7 +75,7 @@ Patch9: long-int-time_t.patch
Patch10: %{name}-system-rocksdb.patch
# https://src.fedoraproject.org/rpms/ceph/blob/rawhide/f/0020-src-arrow-cpp-cmake_modules-ThirdpartyToolchain.cmake.patch
Patch11: %{name}-system-xsimd.patch
-Patch12: %{name}-gcc14.patch
+
Patch13: boost-1.86.patch
Patch14: boost-1.87.patch
Patch15: x32.patch
@@ -356,7 +356,7 @@ uruchamiania demonów.
%endif
%patch -P 10 -p1
%patch -P 11 -p1
-%patch -P 12 -p1
+
%patch -P 13 -p1
%patch -P 14 -p1
%patch -P 15 -p1
@@ -594,7 +594,6 @@ fi
%endif
%{_libexecdir}/ceph/ceph_common.sh
%attr(755,root,root) %{_libexecdir}/ceph/ceph-osd-prestart.sh
-%attr(755,root,root) %{_libdir}/ceph/libcpp_redis.so
%attr(755,root,root) %{_libdir}/ceph/libtacopie.so
%dir %{_libdir}/ceph/compressor
%attr(755,root,root) %{_libdir}/ceph/compressor/libceph_lz4.so*
@@ -752,6 +751,8 @@ fi
%attr(755,root,root) %ghost %{_libdir}/librgw_rados_tp.so.2
%attr(755,root,root) %{_libdir}/libcephsqlite.so
%dir %{_libdir}/ceph
+# needed by librgw.so.*
+%attr(755,root,root) %{_libdir}/ceph/libcpp_redis.so
%attr(755,root,root) %{_libdir}/ceph/libceph-common.so.2
%files devel
diff --git a/ceph-gcc14.patch b/ceph-gcc14.patch
deleted file mode 100644
index 129f50e..0000000
--- a/ceph-gcc14.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 0eace4ea9ea42412d4d6a16d24a8660642e41173 Mon Sep 17 00:00:00 2001
-From: Radoslaw Zarzynski <rzarzyns at redhat.com>
-Date: Wed, 24 Jan 2024 17:22:44 +0000
-Subject: [PATCH] common/dout: fix FTBFS on GCC 14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The following problem has been reported by Kaleb Keithley:
-
-```
-/builddir/build/BUILD/ceph-18.2.1/src/osd/osd_types.h: In lambda function:
-/builddir/build/BUILD/ceph-18.2.1/src/common/dout.h:184:73: error: call to non-‘constexpr’ function ‘virtual unsigned int DoutPrefixProvider::get_subsys() const’
- 184 | dout_impl(pdpp->get_cct(), ceph::dout::need_dynamic(pdpp->get_subsys()), v) \
- | ~~~~~~~~~~~~~~~~^~
-/builddir/build/BUILD/ceph-18.2.1/src/common/dout.h:155:58: note: in definition of macro ‘dout_impl’
- 155 | return (cctX->_conf->subsys.template should_gather<sub, v>()); \
- | ^~~
-/builddir/build/BUILD/ceph-18.2.1/src/osd/osd_types.h:3617:3: note: in expansion of macro ‘ldpp_dout’
- 3617 | ldpp_dout(dpp, 10) << "build_prior all_probe " << all_probe << dendl;
- | ^~~~~~~~~
-```
-
-For details of the problem and the idea behind the fix,
-please refer to the comment this commit brings to `dout.h`.
-
-The minimized replicator that the facilitated Goldbot-based
-investigation:
-
-```cpp
-namespace ceph::dout {
-
-template<typename T>
-struct dynamic_marker_t {
- T value;
- // constexpr ctor isn't needed as it's an aggregate type
- constexpr operator T() const { return value; }
-};
-
-template<typename T>
-constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
- return dynamic_marker_t<T>{ std::forward<T>(t) };
-}
-
-template<typename T>
-struct is_dynamic : public std::false_type {};
-
-template<typename T>
-struct is_dynamic<dynamic_marker_t<T>> : public std::true_type {};
-
-} // ceph::dout
-
-struct subsys_t {
- template <unsigned SubV, int LvlV>
- bool should_gather() const {
- return true;
- }
- bool should_gather(const unsigned sub, int level) const {
- return false;
- }
-};
-
-static subsys_t subsys;
-
- do { \
- const bool should_gather = [&](const auto cctX) { \
- if constexpr (ceph::dout::is_dynamic<decltype(sub)>::value || \
- ceph::dout::is_dynamic<decltype(v)>::value) { \
- std::cout << "the dynamic path" << std::endl; \
- return subsys.should_gather(sub, v); \
- } else { \
- /* The parentheses are **essential** because commas in angle \
- * brackets are NOT ignored on macro expansion! A language's \
- * limitation, sorry. */ \
- std::cout << "the static path" << std::endl; \
- /*return subsys.should_gather(sub, v);*/ \
- return (subsys.template should_gather<sub, v>()); \
- } \
- }(cct); \
- } while (0)
-
- if (decltype(auto) pdpp = (dpp); pdpp) /* workaround -Wnonnull-compare for 'this' */ \
- dout_impl(42, sub, v)
-
- if (decltype(auto) pdpp = (dpp); pdpp) /* workaround -Wnonnull-compare for 'this' */ \
- dout_impl(42, ceph::dout::need_dynamic(42), v)
-
-int main() {
- std::random_device dev;
- std::mt19937 rng(dev());
- std::uniform_int_distribution<std::mt19937::result_type> dist6(1,6); // distribution in range [1, 6]
-
- int sub = dist6(rng);
- ldpp_dout("mocked out", sub);
- //ldpp_subdout("mocked out", 4, 3);
-}
-```
-
-Fixes: https://tracker.ceph.com/issues/64050
-Signed-off-by: Radoslaw Zarzynski <rzarzyns at redhat.com>
----
- src/common/dout.h | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/common/dout.h b/src/common/dout.h
-index 4cd60efff8fef..6516060c5438e 100644
---- a/src/common/dout.h
-+++ b/src/common/dout.h
-@@ -144,17 +144,27 @@ struct is_dynamic<dynamic_marker_t<T>> : public std::true_type {};
- #else
- #define dout_impl(cct, sub, v) \
- do { \
-- const bool should_gather = [&](const auto cctX) { \
-- if constexpr (ceph::dout::is_dynamic<decltype(sub)>::value || \
-- ceph::dout::is_dynamic<decltype(v)>::value) { \
-+ const bool should_gather = [&](const auto cctX, auto sub_, auto v_) { \
-+ /* The check is performed on `sub_` and `v_` to leverage the C++'s \
-+ * guarantee on _discarding_ one of blocks of `if constexpr`, which \
-+ * includes also the checks for ill-formed code (`should_gather<>` \
-+ * must not be feed with non-const expresions), BUT ONLY within \
-+ * a template (thus the generic lambda) and under the restriction \
-+ * it's dependant on a parameter of this template). \
-+ * GCC prior to v14 was not enforcing these restrictions. */ \
-+ if constexpr (ceph::dout::is_dynamic<decltype(sub_)>::value || \
-+ ceph::dout::is_dynamic<decltype(v_)>::value) { \
- return cctX->_conf->subsys.should_gather(sub, v); \
- } else { \
-+ constexpr auto sub_helper = static_cast<decltype(sub_)>(sub); \
-+ constexpr auto v_helper = static_cast<decltype(v_)>(v); \
- /* The parentheses are **essential** because commas in angle \
- * brackets are NOT ignored on macro expansion! A language's \
- * limitation, sorry. */ \
-- return (cctX->_conf->subsys.template should_gather<sub, v>()); \
-+ return (cctX->_conf->subsys.template should_gather<sub_helper, \
-+ v_helper>()); \
- } \
-- }(cct); \
-+ }(cct, sub, v); \
- \
- if (should_gather) { \
- ceph::logging::MutableEntry _dout_e(v, sub); \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/ecc6e94270a0cc846e8e0e7b8f4b4d5eb32259c0
More information about the pld-cvs-commit
mailing list