diff --git a/0001-src-common-crc32c_intel_fast.patch b/0001-src-common-crc32c_intel_fast.patch index d909e8c..80066b7 100644 --- a/0001-src-common-crc32c_intel_fast.patch +++ b/0001-src-common-crc32c_intel_fast.patch @@ -1,5 +1,5 @@ ---- ceph-15.2.2/src/yasm-wrapper.orig 2020-03-09 12:57:37.603837466 -0400 -+++ ceph-15.2.2/src/yasm-wrapper 2020-03-09 13:02:31.496796609 -0400 +--- ceph-15.2.4/src/yasm-wrapper.orig 2020-06-30 11:40:51.000000000 -0400 ++++ ceph-15.2.4/src/yasm-wrapper 2020-07-20 12:21:34.574980869 -0400 @@ -1,10 +1,11 @@ -#!/bin/sh -e +#!/bin/sh @@ -26,8 +26,7 @@ * ) new="$new $1" shift - -@@ -36,8 +43,16 @@ +@@ -36,8 +43,15 @@ esac done @@ -42,7 +41,6 @@ + ld -r -z ibt -z shstk -z noexecstack -o ${object}.tmp ${object} + mv ${object}.tmp ${object} +fi -+ [ -n "$touch" ] && touch $touch diff --git a/ceph.spec b/ceph.spec index 3de31f1..672a98f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -21,6 +21,7 @@ # bcond syntax! ################################################################################# %global _hardened_build 1 +%global __cmake_in_source_build 1 %bcond_with make_check %bcond_with cmake_verbose_logging @@ -101,7 +102,7 @@ ################################################################################# Name: ceph Version: 15.2.4 -Release: 6%{?dist} +Release: 7%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -1222,6 +1223,7 @@ cd build %if 0%{with ocf} -DWITH_OCF=ON \ %endif + -DWITH_REENTRANT_STRSIGNAL=ON \ -DWITH_SYSTEM_BOOST=ON \ %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64 -DWITH_BOOST_CONTEXT=ON \ @@ -1246,7 +1248,6 @@ cd build %else -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \ %endif - -DWITH_REENTRANT_STRSIGNAL=ON \ %if 0%{with cmake_verbose_logging} -DCMAKE_VERBOSE_MAKEFILE=ON \ %endif @@ -2368,6 +2369,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-7 +- see 15.2.4-3, hopefully for real this time + * Fri Jul 17 2020 Kaleb S. KEITHLEY - 2:15.2.4-6 - see 15.2.4-4