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

@@ -1,14 +1,15 @@
-From 8ac49f54ad774324c1de344cd18620df7fa52256 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.5.5
+2.7.4
 

0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch

@@ -1,37 +0,0 @@
-From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
-From: Anthony Alba <ascanio.alba7@gmail.com>
-Date: Mon, 30 Nov 2015 16:44:31 +0800
-Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
-
-Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
----
- src/init-ceph.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index e4cea7e..1f19ffa 100644
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -288,7 +288,7 @@ for name in $what; do
- 	lockfile=""
-     fi
- 
--    get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
-+    get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
- 
-     case "$command" in
- 	start)
-@@ -404,8 +404,8 @@ for name in $what; do
- 		# these keys.  it's also true for legacy installs
- 		# via mkcephfs, which is fine too; there is no harm
- 		# in creating these keys.
--		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
--		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
-+		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
-+		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
- 		    echo Starting ceph-create-keys on $host...
- 		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
- 		    do_cmd "$cmd2"
--- 
-2.5.5
-

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-Apply-ceph-0.94.1-tcmalloc.patch.patch

@@ -1,26 +0,0 @@
-From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 15:47:20 +0200
-Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/rocksdb/configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
-index 855c6a8..fe914aa 100644
---- a/src/rocksdb/configure.ac
-+++ b/src/rocksdb/configure.ac
-@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
- 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"
--- 
-2.5.5
-

0004-Apply-init-ceph.in-fedora.patch.patch

@@ -1,32 +0,0 @@
-From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 15:48:23 +0200
-Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- src/init-ceph.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index 1f19ffa..78eaf97 100644
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -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
--- 
-2.5.5
-

0005-Workaround-xfs.h-check.patch

@@ -1,36 +0,0 @@
-From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Mon, 16 May 2016 20:53:28 +0200
-Subject: [PATCH] Workaround xfs.h check
-
-The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
-
-http://www.spinics.net/lists/ceph-devel/msg29467.html
-
-This should not be too critical and the package should build just fine
-anyway. Commenting out the bits that check for xfs.h should help us,
-here.
-
-Signed-off-by: Boris Ranto <branto@redhat.com>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d1f98aa..e068fdb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
-   [with_libxfs=yes])
- AS_IF([test "x$with_libxfs" != "xno"], [
-   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
--  AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
--    [xfs/xfs.h not found (--without-libxfs to disable)]))
-+  #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
-+  #  [xfs/xfs.h not found (--without-libxfs to disable)]))
-   AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
-   AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
-     #include <xfs/xfs.h>
--- 
-2.5.5
-

sources

@@ -1,3 +1 @@
-e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
-566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
-a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz
+ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz