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.81.0-Makefile.in.patch

@@ -1,40 +0,0 @@
---- ceph-0.81/src/Makefile.in.orig	2014-07-02 09:07:44.888133273 -0400
-+++ ceph-0.81/src/Makefile.in	2014-07-03 13:32:30.213133273 -0400
-@@ -3875,6 +3875,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
-@@ -4928,7 +4929,7 @@
- @LINUX_TRUE@ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- @LINUX_TRUE@nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- @LINUX_TRUE@ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
--@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc
- ceph_test_cls_rbd_LDADD = $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
- ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS)
---- ceph-0.81/src/Makefile-env.am.orig	2014-07-02 09:23:02.126133273 -0400
-+++ ceph-0.81/src/Makefile-env.am	2014-07-03 11:50:14.063133273 -0400
-@@ -64,6 +64,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
---- ceph-0.81/src/test/Makefile.am.orig	2014-07-04 06:36:22.016099589 -0400
-+++ ceph-0.81/src/test/Makefile.am	2014-07-04 06:37:26.156099589 -0400
-@@ -642,7 +642,7 @@
- ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
--ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
- endif
- 

ceph-0.81.0-configure.ac.patch

@@ -1,14 +0,0 @@
---- ceph-0.81/configure.ac.orig	2014-07-04 10:00:39.193099589 -0400
-+++ ceph-0.81/configure.ac	2014-07-04 10:03:54.739099589 -0400
-@@ -425,9 +425,9 @@
-         # the search path.
-         AS_IF([test "x$with_debug" = "xyes"], [
-         	dir='/usr/share/java'
--	        junit4_jar=`find $dir -name junit4.jar | head -n 1`
-+	        junit4_jar=`find $dir -name junit.jar | head -n 1`
- 		AS_IF([test -r "$junit4_jar"], [
--		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit4.jar
-+		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit.jar
- 		      AC_SUBST(EXTRA_CLASSPATH_JAR)
- 		      [have_junit4=1]], [
- 		      AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])

ceph-0.81.0-test-librbd-fsx.c.patch

@@ -1,11 +0,0 @@
---- ceph-0.81/src/test/librbd/fsx.c.orig	2014-07-04 07:23:03.485099589 -0400
-+++ ceph-0.81/src/test/librbd/fsx.c	2014-07-04 08:11:04.208099589 -0400
-@@ -1360,7 +1360,7 @@
- 	int ret, fd;
- 	struct rbd_ctx cur_ctx = RBD_CTX_INIT;
- 	struct stat file_info;
--	char *good_buf, *temp_buf;
-+	char *good_buf, *temp_buf = NULL;
- 
- 	clone_imagename(imagename, sizeof(imagename), clonenum);
- 	if ((ret = ops->open(imagename, &cur_ctx)) < 0) {

ceph-build-support-for-automake-1.12.patch

@@ -1,13 +0,0 @@
-diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
---- ceph-0.51/configure.ac	2012-08-26 01:58:14.000000000 +0300
-+++ ceph-0.51b/configure.ac	2012-09-24 09:19:20.791969694 +0300
-@@ -17,6 +17,9 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-+# fix automake problems in 1.12
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+
- # Automake
- AM_INIT_AUTOMAKE
- AM_PROG_CC_C_O

ceph-fix-sbin-target.patch

@@ -1,31 +0,0 @@
-From 69baa8948f2d922554e815c572d8339a4a197306 Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ken.dreyer@inktank.com>
-Date: Tue, 7 Jan 2014 21:51:14 -0700
-Subject: [PATCH] Fedora only: fix sbin path
-
-On Fedora, /sbin is a symbolic link to /usr/sbin. Install all the sbin
-binaries into the /usr/sbin location.
-
-Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
----
- src/Makefile-env.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 9bc6ee7..d02f034 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -26,8 +26,8 @@ bin_DEBUGPROGRAMS =
- # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
- ceph_sbindir = $(sbindir)
- 
--# certain things go straight into /sbin, though!
--su_sbindir = /sbin
-+# On Fedora these things also go into /usr/sbin
-+su_sbindir = $(sbindir)
- 
- # C/C++ tests to build will be appended to this
- check_PROGRAMS =
--- 
-1.8.3.1
-

ceph-init-fix.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 +1 @@
-5020b63746ccbaa454aab09450ee7a43  ceph-0.81.tar.bz2
+ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz