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

- Disable erasure_codelib neon build
- Use newer -devel package format
- Sync up the spec file

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
+

ceph-0.87-boost157.patch

@@ -1,117 +0,0 @@
-diff -urp ceph-0.87/src/include/encoding.h ceph-0.87-pm/src/include/encoding.h
---- ceph-0.87/src/include/encoding.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/include/encoding.h	2015-01-29 02:47:10.392860344 +0100
-@@ -286,7 +286,7 @@ inline void decode(T &o, bufferlist& bl)
- #include <deque>
- #include <vector>
- #include <string>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- 
- #ifndef _BACKWARD_BACKWARD_WARNING_H
- #define _BACKWARD_BACKWARD_WARNING_H   // make gcc 4.3 shut up about hash_*
-diff -urp ceph-0.87/src/os/DBObjectMap.h ceph-0.87-pm/src/os/DBObjectMap.h
---- ceph-0.87/src/os/DBObjectMap.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/os/DBObjectMap.h	2015-01-29 02:46:59.915044699 +0100
-@@ -17,7 +17,7 @@
- #include "common/Mutex.h"
- #include "common/Cond.h"
- #include "common/simple_cache.hpp"
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- 
- /**
-  * DBObjectMap: Implements ObjectMap in terms of KeyValueDB
-diff -urp ceph-0.87/src/osd/ECBackend.cc ceph-0.87-pm/src/osd/ECBackend.cc
---- ceph-0.87/src/osd/ECBackend.cc	2014-10-29 19:09:19.000000000 +0100
-+++ ceph-0.87-pm/src/osd/ECBackend.cc	2015-01-29 02:56:47.662703397 +0100
-@@ -13,7 +13,7 @@
-  */
- 
- #include <boost/variant.hpp>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include <iostream>
- #include <sstream>
- 
-@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const
-   lhs << "read_result_t(r=" << rhs.r
-       << ", errors=" << rhs.errors;
-   if (rhs.attrs) {
--    lhs << ", attrs=" << rhs.attrs;
-+    lhs << ", attrs=" << (bool)rhs.attrs;
-   } else {
-     lhs << ", noattrs";
-   }
-diff -urp ceph-0.87/src/osd/ECBackend.h ceph-0.87-pm/src/osd/ECBackend.h
---- ceph-0.87/src/osd/ECBackend.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/osd/ECBackend.h	2015-01-29 02:47:01.716013012 +0100
-@@ -18,7 +18,7 @@
- #include "OSD.h"
- #include "PGBackend.h"
- #include "osd_types.h"
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include "erasure-code/ErasureCodeInterface.h"
- #include "ECTransaction.h"
- #include "ECMsgTypes.h"
-diff -urp ceph-0.87/src/osd/ECTransaction.cc ceph-0.87-pm/src/osd/ECTransaction.cc
---- ceph-0.87/src/osd/ECTransaction.cc	2014-10-29 19:09:19.000000000 +0100
-+++ ceph-0.87-pm/src/osd/ECTransaction.cc	2015-01-29 02:47:00.229039175 +0100
-@@ -13,7 +13,7 @@
-  */
- 
- #include <boost/variant.hpp>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include <iostream>
- #include <vector>
- #include <sstream>
-diff -urp ceph-0.87/src/osd/ECTransaction.h ceph-0.87-pm/src/osd/ECTransaction.h
---- ceph-0.87/src/osd/ECTransaction.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/osd/ECTransaction.h	2015-01-29 02:47:01.383018871 +0100
-@@ -19,7 +19,7 @@
- #include "PGBackend.h"
- #include "osd_types.h"
- #include "ECUtil.h"
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include "erasure-code/ErasureCodeInterface.h"
- 
- class ECTransaction : public PGBackend::PGTransaction {
-diff -urp ceph-0.87/src/osd/osd_types.h ceph-0.87-pm/src/osd/osd_types.h
---- ceph-0.87/src/osd/osd_types.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/osd/osd_types.h	2015-01-29 02:47:01.400018572 +0100
-@@ -22,7 +22,7 @@
- #include <stdio.h>
- #include <memory>
- #include <boost/scoped_ptr.hpp>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- 
- #include "include/rados/rados_types.hpp"
- 
-diff -urp ceph-0.87/src/osd/ReplicatedPG.h ceph-0.87-pm/src/osd/ReplicatedPG.h
---- ceph-0.87/src/osd/ReplicatedPG.h	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/osd/ReplicatedPG.h	2015-01-29 02:47:05.062954123 +0100
-@@ -17,7 +17,7 @@
- #ifndef CEPH_REPLICATEDPG_H
- #define CEPH_REPLICATEDPG_H
- 
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include <boost/tuple/tuple.hpp>
- 
- #include "include/assert.h" 
-diff -urp ceph-0.87/src/common/map_cacher.hpp ceph-0.87-pm/src/common/map_cacher.hpp
---- ceph-0.87/src/common/map_cacher.hpp	2014-10-29 19:09:14.000000000 +0100
-+++ ceph-0.87-pm/src/common/map_cacher.hpp	2015-01-29 02:48:12.007776242 +0100
-@@ -16,7 +16,7 @@
- #define MAPCACHER_H
- 
- #include <boost/scoped_ptr.hpp>
--#include <boost/optional.hpp>
-+#include <boost/optional/optional_io.hpp>
- #include "include/memory.h"
- #include <set>
- #include <map>

ceph-google-gperftools.patch

@@ -1,13 +0,0 @@
---- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig	2014-08-15 16:05:00.161794290 +0200
-+++ ceph-0.80.5/src/perfglue/heap_profiler.cc	2014-08-15 16:05:04.691794305 +0200
-@@ -12,8 +12,8 @@
-  * 
-  */
- 
--#include <google/heap-profiler.h>
--#include <google/malloc_extension.h>
-+#include <gperftools/heap-profiler.h>
-+#include <gperftools/malloc_extension.h>
- #include "heap_profiler.h"
- #include "common/environment.h"
- #include "common/LogClient.h"

sources

@@ -1 +1 @@
-32159ac85d2c45862dab5b3ac901402c  ceph-0.87.tar.bz2
+ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz