New version (1:10.2.4-2)

This syncs up with the upstream 10.2.5
Doing it this way because of broken lookaside cache
Fix the -devel obsoletes

0001-Disable-erasure_codelib-neon-build.patch

@@ -0,0 +1,47 @@
+From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 11 Nov 2015 17:08:06 +0100
+Subject: [PATCH] Disable erasure_codelib neon build
+
+---
+ src/erasure-code/jerasure/Makefile.am | 6 +++---
+ src/erasure-code/shec/Makefile.am     | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
+index 6ffe3ed..01f5112 100644
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -75,9 +75,9 @@ if LINUX
+ libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+-if HAVE_NEON
+-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
+-endif
++#if HAVE_NEON
++#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
++#endif
+ 
+ libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am
+index cd93132..948979b 100644
+--- a/src/erasure-code/shec/Makefile.am
++++ b/src/erasure-code/shec/Makefile.am
+@@ -81,9 +81,9 @@ if LINUX
+ libec_shec_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+-if HAVE_NEON
+-erasure_codelib_LTLIBRARIES += libec_shec_neon.la
+-endif
++#if HAVE_NEON
++#erasure_codelib_LTLIBRARIES += libec_shec_neon.la
++#endif
+ 
+ libec_shec_sse3_la_SOURCES = ${shec_sources}
+ libec_shec_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+-- 
+2.7.4
+

0002-msg-simple-Pipe-avoid-returning-0-on-poll-timeout.patch

@@ -0,0 +1,43 @@
+From f7abffec751e454d119df273dc6e49e5f7106078 Mon Sep 17 00:00:00 2001
+From: Sage Weil <sage@redhat.com>
+Date: Wed, 7 Dec 2016 18:25:55 -0600
+Subject: [PATCH] msg/simple/Pipe: avoid returning 0 on poll timeout
+
+If poll times out it will return 0 (no data to read on socket).  In
+165e5abdbf6311974d4001e43982b83d06f9e0cc we changed tcp_read_wait from
+returning -1 to returning -errno, which means we return 0 instead of -1
+in this case.
+
+This makes tcp_read() get into an infinite loop by repeatedly trying to
+read from the socket and getting EAGAIN.
+
+Fix by explicitly checking for a 0 return from poll(2) and returning
+EAGAIN in that case.
+
+Fixes: http://tracker.ceph.com/issues/18184
+Signed-off-by: Sage Weil <sage@redhat.com>
+(cherry picked from commit 6c3d015c6854a12cda40673848813d968ff6afae)
+---
+ src/msg/simple/Pipe.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
+index 80b948d..cfb1986 100644
+--- a/src/msg/simple/Pipe.cc
++++ b/src/msg/simple/Pipe.cc
+@@ -2500,8 +2500,11 @@ int Pipe::tcp_read_wait()
+   if (has_pending_data())
+     return 0;
+ 
+-  if (poll(&pfd, 1, msgr->timeout) <= 0)
++  int r = poll(&pfd, 1, msgr->timeout);
++  if (r < 0)
+     return -errno;
++  if (r == 0)
++    return -EAGAIN;
+ 
+   evmask = POLLERR | POLLHUP | POLLNVAL;
+ #if defined(__linux__)
+-- 
+2.7.4
+

0002-src-common-CMakeLists.txt.patch

@@ -1,13 +0,0 @@
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 65ba10b0f1..eeedc29c37 100644
---- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
-     crc32c_aarch64.c)
- endif(HAVE_INTEL)
- 
--add_library(crc32 ${crc32_srcs})
-+add_library(crc32 STATIC ${crc32_srcs})
- if(HAVE_ARMV8_CRC)
-   set_target_properties(crc32 PROPERTIES
-     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")

0003-src-common-bitstr.h.patch

@@ -1,13 +0,0 @@
---- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
-+++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
-@@ -14,7 +14,10 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
- 
-+#include <cstdint>
-+#include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;

0004-src-librbd-api-PoolMetadata.h.patch

@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 

0005-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,39 +0,0 @@
---- a/cmake/modules/CheckCxxAtomic.cmake	2020-03-02 12:49:20.000000000 -0500
-+++ b/cmake/modules/CheckCxxAtomic.cmake	2020-01-29 12:53:56.952149798 -0500
-@@ -10,18 +10,29 @@
-     check_cxx_source_compiles("
- #include <atomic>
- #include <cstdint>
-+
-+#if __s390x__
-+// Boost needs 16-byte atomics for tagged pointers.
-+// These are implemented via inline instructions on the platform
-+// if 16-byte alignment can be proven, and are delegated to libatomic
-+// library routines otherwise.  Whether or not alignment is provably
-+// OK for a std::atomic unfortunately depends on compiler version and
-+// optimization levels, and also on the details of the expression.
-+// We specifically test access via an otherwise unknown pointer here
-+// to ensure we get the most complex case.  If this access can be
-+// done without libatomic, then all accesses can be done.
-+bool atomic16(std::atomic<unsigned __int128> *ptr)
-+{
-+  return *ptr != 0;
-+}
-+#endif
-+
- int main() {
-   std::atomic<uint8_t> w1;
-   std::atomic<uint16_t> w2;
-   std::atomic<uint32_t> w4;
-   std::atomic<uint64_t> w8;
--#ifdef __s390x__
--  // Boost needs 16-byte atomics for tagged pointers.
--  std::atomic<unsigned __int128> w16;
--#else
--  #define w16 0
--#endif
--  return w1 + w2 + w4 + w8 + w16;
-+  return w1 + w2 + w4 + w8;
- }
- " ${var})
- endfunction(check_cxx_atomics)

sources

@@ -1 +1 @@
-SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
+ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz