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

@@ -1,14 +1,15 @@
-From 8b0b78dc06ae1ed1c5f3c7a13271e7037091d0be Mon Sep 17 00:00:00 2001
+From 2a7810f39cb113570efcde5f65e5440ff9587ae0 Mon Sep 17 00:00:00 2001
 From: Boris Ranto <branto@redhat.com>
-Date: Wed, 15 Apr 2015 14:06:24 +0200
+Date: Wed, 11 Nov 2015 17:08:06 +0100
 Subject: [PATCH] Disable erasure_codelib neon build
 
 ---
  src/erasure-code/jerasure/Makefile.am | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 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 9ca4fbb..147d57e 100644
+index 6ffe3ed..01f5112 100644
 --- a/src/erasure-code/jerasure/Makefile.am
 +++ b/src/erasure-code/jerasure/Makefile.am
 @@ -75,9 +75,9 @@ if LINUX
@@ -24,6 +25,23 @@ index 9ca4fbb..147d57e 100644
  
  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.1.0
+2.7.4
 

0002-Add-support-for-PPC-arch.patch

@@ -1,33 +0,0 @@
-From b2781fb5638afae7438b983a912ede126a8c5b85 Mon Sep 17 00:00:00 2001
-From: James Page <james.page@ubuntu.com>
-Date: Fri, 13 Mar 2015 19:46:04 +0000
-Subject: [PATCH] Add support for PPC architecture, provide fallback
-
-Add high precision cpu cycles support for powerpc and powerpc64.
-
-Provide a fallback for other architectures and warn during
-compilation.
-
-Signed-off-by: James Page <james.page@ubuntu.com>
-
-diff --git a/src/common/Cycles.h b/src/common/Cycles.h
-index 6e47cde..bb47d5c 100644
---- a/src/common/Cycles.h
-+++ b/src/common/Cycles.h
-@@ -72,8 +72,15 @@ class Cycles {
-     uint64_t cntvct;
-     asm volatile ("isb; mrs %0, cntvct_el0; isb; " : "=r" (cntvct) :: "memory");
-     return cntvct;
-+#elif defined(__powerpc__) || defined (__powerpc64__)
-+    // Based on:
-+    // https://github.com/randombit/botan/blob/net.randombit.botan/src/lib/entropy/hres_timer/hres_timer.cpp
-+    uint32_t lo = 0, hi = 0;
-+    asm volatile("mftbu %0; mftb %1" : "=r" (hi), "=r" (lo));
-+    return (((uint64_t)hi << 32) | lo);
- #else
--#error No high-precision counter available for your OS/arch
-+#warning No high-precision counter available for your OS/arch
-+    return 0;
- #endif
-   }
- 

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
+

0003-Skip-initialization-if-rtdsc-is-not-implemented.patch

@@ -1,33 +0,0 @@
-From fdd728c0872b34d1b6f96ee5601b619748afc9e8 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 18 May 2015 20:27:56 +0200
-Subject: [PATCH] Skip initialization if rtdsc is not implemented
-
-Patch by James Page. See
-
-https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1432786
-
-for more details.
----
- src/common/Cycles.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc
-index a2efcf3..a5367f7 100644
---- a/src/common/Cycles.cc
-+++ b/src/common/Cycles.cc
-@@ -52,6 +52,11 @@ void Cycles::init()
-   if (cycles_per_sec != 0)
-     return;
- 
-+
-+  // Skip initialization if rtdsc is not implemented
-+  if (rdtsc() == 0)
-+    return;
-+
-   // Compute the frequency of the fine-grained CPU timer: to do this,
-   // take parallel time readings using both rdtsc and gettimeofday.
-   // After 10ms have elapsed, take the ratio between these readings.
--- 
-2.1.0
-

ceph-0.94.1-tcmalloc.patch

@@ -1,12 +0,0 @@
-diff -up ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc ceph-0.94.1/src/rocksdb/configure.ac
---- ceph-0.94.1/src/rocksdb/configure.ac.tcmalloc	2015-06-08 14:03:27.000000000 +0200
-+++ ceph-0.94.1/src/rocksdb/configure.ac	2015-06-08 14:03:41.000000000 +0200
-@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress]
- AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
- AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
- AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
--AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
-+AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
- 
- OLD_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -std=c++11"

init-ceph.in-fedora.patch

@@ -1,18 +0,0 @@
-diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
---- ceph-0.46/src/init-ceph.in.orig	2012-04-24 16:06:39.000000000 -0400
-+++ ceph-0.46/src/init-ceph.in	2012-05-09 16:41:36.500004052 -0400
-@@ -1,11 +1,11 @@
- #!/bin/sh
- # Start/stop ceph daemons
--# chkconfig: 2345 60 80
-+# chkconfig: - 60 80
-
- ### BEGIN INIT INFO
- # Provides:          ceph
--# Default-Start:     2 3 4 5
--# Default-Stop:      0 1 6
-+# Default-Start:
-+# Default-Stop:
- # Required-Start:    $remote_fs $named $network $time
- # Required-Stop:     $remote_fs $named $network $time
- # Short-Description: Start Ceph distributed file system daemons at boot time

sources

@@ -1,2 +1 @@
-00d910ac57529be846e31a04bc4ab84e  ceph-0.87.1.tar.bz2
-e4a625aa2c91fe5d3f0c62faa4716ca2  ceph-0.94.1.tar.bz2
+ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz