From 4c3aa1f16c9c23700e6af505de5c16aa84733adc Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 23 Mar 2023 06:29:19 +0100
Subject: [PATCH] - updated to 17.2.5

---
 ceph-gcc12.patch  | 20 --------------------
 ceph-libfmt.patch | 26 +++++++-------------------
 ceph.spec         |  7 ++++---
 3 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/ceph-gcc12.patch b/ceph-gcc12.patch
index 7e4f116..4440750 100644
--- a/ceph-gcc12.patch
+++ b/ceph-gcc12.patch
@@ -19,26 +19,6 @@
    }
  }
  
---- ceph-16.2.7/src/common/dout.h.orig	2022-01-18 08:58:11.805226954 -0500
-+++ ceph-16.2.7/src/common/dout.h	2022-01-19 08:06:23.987388663 -0500
-@@ -99,11 +99,15 @@
- template<typename T>
- struct dynamic_marker_t {
-   T value;
--  operator T() const { return value; }
-+  // constexpr ctor isn't needed as it's an aggregate type
-+  constexpr operator T() const { return value; }
- };
- 
- template<typename T>
--dynamic_marker_t<T> need_dynamic(T&& t) {
-+constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
-+  // deprecated in C++17 but that's fine for testing
-+  static_assert(std::is_literal_type_v<T>);
-+  static_assert(std::is_literal_type_v<dynamic_marker_t<T>>);
-   return dynamic_marker_t<T>{ std::forward<T>(t) };
- }
- 
 --- 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 @@
diff --git a/ceph-libfmt.patch b/ceph-libfmt.patch
index 72fabc9..705358b 100644
--- a/ceph-libfmt.patch
+++ b/ceph-libfmt.patch
@@ -70,15 +70,6 @@
  #include "crimson/admin/admin_socket.h"
  #include "crimson/common/log.h"
  #include "crimson/osd/exceptions.h"
-@@ -299,7 +300,7 @@ static ghobject_t test_ops_get_object_na
-       // the return type of `fmt::format` is `std::string`
-       using namespace fmt::literals;
-       throw std::invalid_argument{
--        "Invalid pool '{}'"_format(*pool_arg)
-+	fmt::format("Invalid pool '{}'", *pool_arg)
-       };
-     }
-     return pool;
 --- ceph-17.2.3/src/crimson/admin/pg_commands.cc.orig	2022-07-28 23:52:12.000000000 +0200
 +++ ceph-17.2.3/src/crimson/admin/pg_commands.cc	2022-09-14 20:59:47.803920736 +0200
 @@ -13,6 +13,7 @@
@@ -1601,13 +1592,13 @@
  	      return seastar::now();
  	    });
  	  }).si_then([&ret] {
---- ceph-17.2.3/src/mon/LogMonitor.cc.orig	2022-07-28 23:52:12.000000000 +0200
-+++ ceph-17.2.3/src/mon/LogMonitor.cc	2022-09-04 17:59:19.765987645 +0200
+--- ceph-17.2.5/src/mon/LogMonitor.cc.orig	2023-03-22 06:45:27.743273749 +0100
++++ ceph-17.2.5/src/mon/LogMonitor.cc	2023-03-22 06:25:06.412142157 +0100
 @@ -415,7 +415,7 @@ void LogMonitor::log_external(const LogE
      }
  
      if (fd >= 0) {
--      fmt::format_to(file_log_buffer, "{}\n", le);
+-      fmt::format_to(std::back_inserter(file_log_buffer), "{}\n", le);
 +      fmt::format_to(std::back_inserter(file_log_buffer), "{}\n", fmt::streamed(le));
        int err = safe_write(fd, file_log_buffer.data(), file_log_buffer.size());
        file_log_buffer.clear();
@@ -1645,10 +1636,10 @@
 +
 +template <>
 +struct fmt::formatter<entity_addrvec_t> : ostream_formatter {};
---- ceph-17.2.3/src/osd/osd_types_fmt.h.orig	2022-07-28 23:52:12.000000000 +0200
-+++ ceph-17.2.3/src/osd/osd_types_fmt.h	2022-09-14 16:25:21.495245277 +0200
-@@ -104,3 +104,21 @@ struct fmt::formatter<object_info_t> {
-     return fmt::format_to(ctx.out(), ")");
+--- ceph-17.2.5/src/osd/osd_types_fmt.h.orig	2023-03-22 06:45:27.893272937 +0100
++++ ceph-17.2.5/src/osd/osd_types_fmt.h	2023-03-22 06:26:17.049743254 +0100
+@@ -115,3 +115,18 @@ struct fmt::formatter<pg_t> {
+     return fmt::format_to(ctx.out(), "{}.{:x}", pg.pool(), pg.m_seed);
    }
  };
 +
@@ -1659,9 +1650,6 @@
 +struct fmt::formatter<pg_history_t> : ostream_formatter {};
 +
 +template <>
-+struct fmt::formatter<pg_t> : ostream_formatter {};
-+
-+template <>
 +struct fmt::formatter<spg_t> : ostream_formatter {};
 +
 +template <>
diff --git a/ceph.spec b/ceph.spec
index e2c7a1f..ca3f744 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -47,12 +47,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:	17.2.3
-Release:	4
+Version:	17.2.5
+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:	96f10fa942ec0db4008993cddaec88ec
+# Source0-md5:	e331cea04680ea8ff982a58c516d7611
 Source1:	ceph.sysconfig
 Source3:	ceph.tmpfiles
 Patch0:		%{name}-python.patch
@@ -527,6 +527,7 @@ fi
 %attr(755,root,root) %{_bindir}/ceph-dencoder
 %attr(755,root,root) %{_bindir}/ceph-diff-sorted
 %attr(755,root,root) %{_bindir}/ceph-erasure-code-tool
+%attr(755,root,root) %{_bindir}/ceph-exporter
 %attr(755,root,root) %{_bindir}/ceph-immutable-object-cache
 %attr(755,root,root) %{_bindir}/ceph-kvstore-tool
 %attr(755,root,root) %{_bindir}/ceph-mds
-- 
2.44.0