ceph-18.2.4, include/rados/rgw_file.h

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

0039-src-common-dout.h.patch

@@ -0,0 +1,37 @@
+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);                        \

0041-CMakeLists.txt.patch

@@ -1,14 +0,0 @@
---- 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

@@ -20,6 +20,7 @@
 # please read this for explanation of bcond syntax:
 # https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html
 #################################################################################
+
 %bcond_with make_check
 %bcond_with zbd
 %bcond_with cmake_verbose_logging
@@ -98,7 +99,7 @@
 %else
 %bcond_without jaeger
 %endif
-%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 10
 # distros that ship cmd2 and/or colorama
 %bcond_without cephfs_shell
 %else
@@ -172,8 +173,8 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	18.2.6
-Release:	1%{?dist}
+Version:	18.2.4
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -209,8 +210,8 @@ 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
@@ -466,9 +467,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
@@ -936,6 +937,7 @@ 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
@@ -2656,15 +2658,6 @@ exit 0
 %{python3_sitelib}/ceph_node_proxy-*
 
 %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
 
@@ -2677,46 +2670,11 @@ exit 0
 * Mon Apr 29 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.3-1
 - ceph-18.2.3 GA
 
-* Tue Mar 19 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.2-3
-- rebuild with libarrow-15.0.2
-
-* Fri Mar 15 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.2-2
-- rebuild with libarrow-15.0.1. (And liborc-2.0.0)
-
 * Thu Mar 7 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.2-1
 - ceph-18.2.2 GA
 
-* 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
-- Rebuild for ICU 74
-
-* Fri Jan 26 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-8
-- rebuild for libarrow-15.0.0, rhbz#2260552
-
-* Wed Jan 24 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-7
-- rebuild for Fedora_40_Mass_Rebuild, gcc-14, and rocksdb-8.10.0,
-  libarrow-14.0.2
-
-* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:18.2.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:18.2.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 15 2024 Florian Weimer <fweimer@redhat.com> - 2:18.2.1-5
-- Backport upstream patches to fix C compatibility issues
-
-* Sat Jan 13 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-4
-- rebuild with rocksdb-8.10.0
+* Wed Jan 10 2024 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-4
+- ceph-18.2.1, temporarily disable LTO, rhbz#2241339
 
 * Tue Dec 19 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-3
 - ceph-18.2.1, incorporate changes from *final* 18.2.1 release from
@@ -2729,15 +2687,6 @@ exit 0
 * Wed Nov 15 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.1-1
 - ceph-18.2.1 GA
 
-* Wed Nov 1 2023 Terje Rosten <terje.rosten@ntnu.no> - 2:18.2.0-4
-- Rebuild for gtest 1.14.0 and libarrow 14.0.0
-
-* Wed Nov 1 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.0-3
-- Rebuild for Apache Arrow (libarrow) 14.0.0
-
-* Thu Oct 5 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.0-2
-- ceph-18.2.0, rebuild in side tag (f40-build-side-74974)
-
 * Fri Aug 4 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:18.2.0-1
 - ceph-18.2.0 GA
 

sources

@@ -1 +1 @@
-SHA512 (ceph-18.2.6.tar.gz) = 06bef880543a3c444783ed4a3927fd94a7b05180d35d356372f36679f1e00c3ee2cf3b0c15732fdc0c1ba55c922e07b7fa66274cb12a196914c79faa99859f13
+SHA512 (ceph-18.2.4.tar.gz) = a4ebb4e14032e6ab8e1fd8836f39234b771cb0a4b655166e9c69493a2c0d687064af4bb35523d0501629605521854e49f5c53a56279f72810d108c76f4f88c5b