From 28a5a15845dca6adbcfe4dcf1db16972e7bf7d79 Mon Sep 17 00:00:00 2001 From: jchzhou Date: Thu, 4 Sep 2025 23:42:09 +0800 Subject: [PATCH 1/2] backport a patch for fixing building issues --- ...rror-from-deleted-assignment-operato.patch | 32 +++++++++++++++++++ ceph.spec | 7 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0008-backport-C-Fix-compiler-error-from-deleted-assignment-operato.patch diff --git a/0008-backport-C-Fix-compiler-error-from-deleted-assignment-operato.patch b/0008-backport-C-Fix-compiler-error-from-deleted-assignment-operato.patch new file mode 100644 index 0000000..3d89bb7 --- /dev/null +++ b/0008-backport-C-Fix-compiler-error-from-deleted-assignment-operato.patch @@ -0,0 +1,32 @@ +From 7987ba574b478fa86449467f5b83ca9adcbe53c8 Mon Sep 17 00:00:00 2001 +From: jdess <4703565+jdess@users.noreply.github.com> +Date: Fri, 24 Jul 2020 10:17:06 +0200 +Subject: [PATCH] [C++] Fix compiler error from deleted assignment operator + (#6036) + +The assignment operator of the `buf_` member is deleted, we cannot call it from the assignment operator of the `TableKeyComparator` struct. + +=> Also delete the assignment operator of the `TableKeyComparator` struct (already private anyhow). +--- + .../thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h b/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h +index c4dc5bcd0..0f3a7dfd9 100644 +--- a/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h ++++ b/src/arrow/cpp/thirdparty/flatbuffers/include/flatbuffers/flatbuffers.h +@@ -1871,10 +1871,7 @@ class FlatBufferBuilder { + vector_downward &buf_; + + private: +- TableKeyComparator &operator=(const TableKeyComparator &other) { +- buf_ = other.buf_; +- return *this; +- } ++ FLATBUFFERS_DELETE_FUNC(TableKeyComparator &operator=(const TableKeyComparator &other)) + }; + /// @endcond + +-- +2.51.0 + diff --git a/ceph.spec b/ceph.spec index 091034a..cc9eb42 100644 --- a/ceph.spec +++ b/ceph.spec @@ -174,7 +174,7 @@ ################################################################################# Name: ceph Version: 18.2.2 -Release: 8 +Release: 9 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -199,6 +199,8 @@ Patch4: 0004-fix-mds-metadata-lost-in-one-case.patch Patch5: 0005-fix-CVE-2024-48916.patch Patch6: 0006-client-set-LIBMOUNT_FORCE_MOUNT2-always.patch Patch7: 0007-client-disallow-unprivileged-users-to-escalate-root.patch +# https://github.com/google/flatbuffers/pull/6047 +Patch8: 0008-backport-C-Fix-compiler-error-from-deleted-assignment-operato.patch %ifarch riscv64 Patch9002: 9002-fix-riscv64-build.patch @@ -2645,6 +2647,9 @@ exit 0 %{_datadir}/snmp/mibs %changelog +* Thu Sep 04 2025 jchzhou - 2:18.2.2-9 +- backport a patch for fixing building issues + * Mon Jul 7 2025 lizhipeng - 2:18.2.2-8 - fix CVE-2025-52555 -- Gitee From c283f63208a8140b3e7749225eb1925dd91926c8 Mon Sep 17 00:00:00 2001 From: jchzhou Date: Tue, 23 Sep 2025 15:30:34 +0800 Subject: [PATCH 2/2] fix building issues with newer compilers --- ceph.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index cc9eb42..2e865f8 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1338,8 +1338,8 @@ done %endif export CPPFLAGS="$java_inc" -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$RPM_OPT_FLAGS -Wno-error=int-conversion" +export CXXFLAGS="$RPM_OPT_FLAGS -Wno-error=int-conversion" export LDFLAGS="$RPM_LD_FLAGS" %if 0%{with seastar} -- Gitee