ceph 18.2.6 GA

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

0039-src-common-dout.h.patch

@@ -1,37 +0,0 @@
-diff --git a/src/common/dout.h b/src/common/dout.h
-index 4cd60efff8fef..db68a042a7f1b 100644
---- a/src/common/dout.h
-+++ b/src/common/dout.h
-@@ -144,17 +144,24 @@ 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 {								\
--      /* 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>());	\
-+      constexpr auto sub_helper = static_cast<decltype(sub_)>(sub);	\
-+      constexpr auto v_helper = static_cast<decltype(v_)>(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);                        \

0040-src-include-rados-rgw_file.h.patch

@@ -0,0 +1,11 @@
+--- ceph-18.2.4/src/include/rados/rgw_file.h.orig	2024-09-23 12:05:39.942703570 -0400
++++ ceph-18.2.4/src/include/rados/rgw_file.h	2024-09-23 12:05:55.800441732 -0400
+@@ -27,7 +27,7 @@
+ 
+ #define LIBRGW_FILE_VER_MAJOR 1
+ #define LIBRGW_FILE_VER_MINOR 2
+-#define LIBRGW_FILE_VER_EXTRA 0
++#define LIBRGW_FILE_VER_EXTRA 1
+ 
+ #define LIBRGW_FILE_VERSION(maj, min, extra) ((maj << 16) + (min << 8) + extra)
+ #define LIBRGW_FILE_VERSION_CODE LIBRGW_FILE_VERSION(LIBRGW_FILE_VER_MAJOR, LIBRGW_FILE_VER_MINOR, LIBRGW_FILE_VER_EXTRA)

0041-CMakeLists.txt.patch

@@ -0,0 +1,14 @@
+--- ceph-18.2.4/CMakeLists.txt.orig	2025-04-08 12:58:08.231622137 -0400
++++ ceph-18.2.4/CMakeLists.txt	2025-04-08 12:58:17.021471996 -0400
+@@ -739,11 +739,3 @@
+ option(WITH_GRAFANA "install grafana dashboards" OFF)
+ add_subdirectory(monitoring/ceph-mixin)
+ 
+-include(CTags)
+-option(CTAG_EXCLUDES "Exclude files/directories when running ctag.")
+-add_tags(ctags
+-  SRC_DIR src
+-  TAG_FILE tags
+-  EXCLUDE_OPTS ${CTAG_EXCLUDES}
+-  EXCLUDES "*.js" "*.css" ".tox" "python-common/build")
+-add_custom_target(tags DEPENDS ctags)

ceph.spec

@@ -98,7 +98,7 @@
 %else
 %bcond_without jaeger
 %endif
-%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 10
+%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9
 # distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
 %else
@@ -172,7 +172,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	18.2.3
+Version:	18.2.6
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -209,7 +209,9 @@ Patch0034:	0034-src-pybind-rbd-rbd.pyx.patch
 Patch0035:	0035-src-CMakeLists.txt.patch
 Patch0037:	ceph-c99-1.patch
 Patch0038:	ceph-c99-2.patch
-Patch0039:	0039-src-common-dout.h.patch
+Patch0040:	0040-src-include-rados-rgw_file.h.patch
+Patch0041:	0041-CMakeLists.txt.patch
+
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
 %if 0%{?suse_version}
@@ -464,9 +466,9 @@ BuildRequires:	python%{python3_pkgversion}-scipy
 BuildRequires:	python%{python3_pkgversion}-werkzeug
 BuildRequires:	python%{python3_pkgversion}-pyOpenSSL
 %endif
+BuildRequires:	jsonnet
 %if 0%{?suse_version}
 BuildRequires:	golang-github-prometheus-prometheus
-BuildRequires:	jsonnet
 BuildRequires:	libxmlsec1-1
 BuildRequires:	libxmlsec1-nss1
 BuildRequires:	libxmlsec1-openssl1
@@ -934,7 +936,6 @@ Requires:	parted
 Requires:	util-linux
 Requires:	xfsprogs
 Requires:	python%{python3_pkgversion}-setuptools
-Requires:	python%{python3_pkgversion}-packaging
 Requires:	python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release}
 %description volume
 This package contains a tool to deploy OSD with different devices like
@@ -2328,6 +2329,7 @@ fi
 %endif
 
 %files -n librados2
+%doc %{_docdir}/ceph/COPYING
 %{_libdir}/librados.so.*
 %dir %{_libdir}/ceph
 %{_libdir}/ceph/libceph-common.so.*
@@ -2386,6 +2388,7 @@ fi
 %endif
 
 %files -n librbd1
+%doc %{_docdir}/ceph/COPYING
 %{_libdir}/librbd.so.*
 %if %{with lttng}
 %{_libdir}/librbd_tp.so.*
@@ -2651,15 +2654,29 @@ exit 0
 %dir %{python3_sitelib}/ceph_node_proxy
 %{python3_sitelib}/ceph_node_proxy/*
 %{python3_sitelib}/ceph_node_proxy-*
-#%{_mandir}/man8/ceph-node-proxy.8*
 
 %changelog
+* Mon Apr 21 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.6-1
+- ceph-18.2.6
+
+* Thu Apr 17 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.5-2
+- ceph-18.2.5, sync w/ upstream .spec
+
+* Fri Apr 11 2025 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.5-1
+- ceph-18.2.5 GA
+
+* Mon Sep 23 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.4-2
+- ceph-18.2.4, include/rados/rgw_file.h
+
+* Mon Jul 15 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.4-1
+- ceph-18.2.4 GA
+
+* Sun Jul 7 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.3-2
+- rhbz#2295843, include license (COPYING) file in selected subpackages
+
 * Mon Apr 29 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.3-1
 - ceph-18.2.3 GA
 
-* Mon Apr 22 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.2-4
-- rebuild with libarrow-16.0.0
-
 * Tue Mar 19 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.2-3
 - rebuild with libarrow-15.0.2
 
@@ -2672,7 +2689,11 @@ exit 0
 * Wed Mar 06 2024 David Abdurachmanov <davidlt@rivosinc.com> - 2:18.2.1-11
 - Add support for riscv64
 
+<<<<<<< HEAD
+* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 2:18.2.1-10
+=======
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2:18.2.1-10
+>>>>>>> rawhide
 - Rebuilt for java-21-openjdk as system jdk
 
 * Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 2:18.2.1-9

sources

@@ -1 +1 @@
-SHA512 (ceph-18.2.3.tar.gz) = 224349dcf531570ba0bde63b952f67d34128d76a24f59c6dade487257fbcee1f31dbf45e14e1716da051a6c016080cfa162a86803e08c23e7da1c52605428903
+SHA512 (ceph-18.2.6.tar.gz) = 06bef880543a3c444783ed4a3927fd94a7b05180d35d356372f36679f1e00c3ee2cf3b0c15732fdc0c1ba55c922e07b7fa66274cb12a196914c79faa99859f13