ceph-17.2.7, Requires: fuse -> fuse3

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

0024-gcc-13.patch

@@ -40,25 +40,6 @@
  
    // Instance of RxHandler must be reset before doing any decrypt-update
    // step. This applies also to situation when decrypt-final was already
---- ceph-17.2.5/src/common/Cycles.h.orig	2023-01-17 07:56:19.787662012 -0500
-+++ ceph-17.2.5/src/common/Cycles.h	2023-01-17 07:56:57.852980655 -0500
-@@ -29,8 +29,9 @@
-  */
- 
- 
--#ifndef CEPH_CYCLES_H
--#define CEPH_CYCLES_H
-+#pragma once
-+
-+#include <cstdint>
- 
- /**
-  * This class provides static methods that read the fine-grain CPU
-@@ -112,4 +113,3 @@
-   }
- };
- 
--#endif  // CEPH_CYCLES_H
 --- ceph-17.2.5/src/test/librados/op_speed.cc.orig	2023-01-17 08:57:37.078531022 -0500
 +++ ceph-17.2.5/src/test/librados/op_speed.cc	2023-01-17 08:57:58.259139439 -0500
 @@ -9,7 +9,7 @@
@@ -80,16 +61,6 @@
  #include <stdlib.h>
  #include <stdio.h>
  #include <unistd.h>
---- ceph-17.2.5/src/librbd/api/PoolMetadata.h.orig	2023-01-17 13:07:44.701750744 -0500
-+++ ceph-17.2.5/src/librbd/api/PoolMetadata.h	2023-01-17 13:08:10.300301845 -0500
-@@ -9,6 +9,7 @@
- 
- #include <map>
- #include <string>
-+#include <cstdint>
- 
- namespace librbd {
- 
 --- ceph-17.2.5/src/rocksdb/db/compaction/compaction_iteration_stats.h.orig	2023-01-26 17:05:20.605333926 -0500
 +++ ceph-17.2.5/src/rocksdb/db/compaction/compaction_iteration_stats.h	2023-01-26 17:05:46.376880846 -0500
 @@ -6,6 +6,7 @@

0028-cmake-modules-BuildBoost.cmake.patch

@@ -0,0 +1,15 @@
+--- ceph-17.2.6/cmake/modules/BuildBoost.cmake.orig	2023-04-27 14:00:28.239524778 -0400
++++ ceph-17.2.6/cmake/modules/BuildBoost.cmake	2023-04-28 07:49:59.743342207 -0400
+@@ -63,7 +63,11 @@
+   else()
+     list(APPEND boost_features "address-model=32")
+   endif()
+-  set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
++    set(BOOST_CXXFLAGS "-fPIC -w -fcf-protection") # check on arm, etc <---XXX
++  else()
++    set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
++  endif()
+   list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
+ 
+   set(boost_with_libs)

0029-boost-asm.patch

@@ -0,0 +1,61 @@
+--- ceph-17.2.6/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.009605033 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/make_x86_64_sysv_elf_gas.S	2023-04-30 14:28:32.239465067 -0400
+@@ -80,3 +80,18 @@
+ 
+ /* Mark that we don't need executable stack. */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++
+--- ceph-17.2.6/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.008605050 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S	2023-04-30 14:27:50.145210847 -0400
+@@ -89,3 +89,17 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+--- ceph-17.2.6/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S.orig	2023-04-30 14:25:35.009605033 -0400
++++ ceph-17.2.6/src/boost/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S	2023-04-30 14:29:30.402434597 -0400
+@@ -92,3 +92,17 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++.section .note.gnu.property
++.align=8
++
++        .byte 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x00, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x01, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++        .byte 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00
++        .byte 0x05, 0x00, 0x00, 0x00, 0x47, 0x4E, 0x55, 0x00
++        .byte 0x02, 0x00, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x00
++        .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

ceph.spec

@@ -159,8 +159,8 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	17.2.6
-Release:	1%{?dist}
+Version:	17.2.7
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -193,6 +193,9 @@ Patch0023:	0023-src-s3select-include-s3select_parquet_intrf.h.patch
 Patch0024:	0024-gcc-13.patch
 Patch0025:	0025-selinux-prepare-for-anon-inode-controls-enablement.patch
 Patch0026:	0026-src-boost-libs-python-src-object.patch
+Patch0028:	0028-cmake-modules-BuildBoost.cmake.patch
+Patch0029:	0029-boost-asm.patch
+
 # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
 ExcludeArch:	i686 armv7hl
 %if 0%{?suse_version}
@@ -759,7 +762,7 @@ Summary:	Ceph fuse-based client
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	fuse
+Requires:	fuse3
 Requires:	python%{python3_pkgversion}
 %description fuse
 FUSE based client for Ceph distributed network file system
@@ -1386,7 +1389,7 @@ env | sort
     -DWITH_SYSTEM_ROCKSDB:BOOL=ON \
 %endif
     -DWITH_SYSTEM_LIBURING:BOOL=ON \
-    -DWITH_SYSTEM_BOOST:BOOL=OFF \
+    -DWITH_SYSTEM_BOOST:BOOL=ON \
 %if 0%{with cephfs_shell}
     -DWITH_CEPHFS_SHELL:BOOL=ON \
 %endif
@@ -1887,6 +1890,7 @@ fi
 %{_datadir}/ceph/mgr/prometheus
 %{_datadir}/ceph/mgr/rbd_support
 %{_datadir}/ceph/mgr/restful
+%{_datadir}/ceph/mgr/rgw
 %{_datadir}/ceph/mgr/selftest
 %{_datadir}/ceph/mgr/snap_schedule
 %{_datadir}/ceph/mgr/stats
@@ -2617,6 +2621,19 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Fri Nov 2 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.7-2
+- ceph-17.2.7,  Requires: fuse -> fuse3
+
+* Thu Oct 26 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.7-1
+- ceph-17.2.7 GA
+
+* Mon May 22 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-3
+- ceph-17.2.6, restore WITH_SYSTEM_BOOST=YES (f38 still has boost-1.78)
+
+* Mon May 1 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-2
+- ceph-17.2.6, enable IBT, SHSTK when building bundled boost, librgw.so
+  libceph-common.so
+
 * Fri Apr 7 2023 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:17.2.6-1
 - ceph-17.2.6 GA
 

sources

@@ -1 +1 @@
-SHA512 (ceph-17.2.6.tar.gz) = dca9aea2ce210c15fcc34cb06a5dc5b4488ffa36d684166d47ebd87e48b54b6fee0882e1c67007a780e1c25754e9bc6e760cc10f60ea1183263f8504ef2dbd9b
+SHA512 (ceph-17.2.7.tar.gz) = 9005de7661c6a9d1054f1388cff2f48eb1af93565ebf852669de546eed594ed6a2668944b25a64c406d00f88bd2f7a6eac2ae96b04789c03ea4d248d1a683e7b