Rebase to 0.80.9

- Perform a hardened build
- Use git-formatted patches
- Do not remove conf files on uninstall
- Remove the cleanup post-script function

0001-Disable-erasure_codelib-neon-build.patch

@@ -1,47 +0,0 @@
-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
-

0001-gperftools-deprecated-google-includes.patch

@@ -0,0 +1,27 @@
+From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 14 Jan 2015 07:46:56 +0100
+Subject: [PATCH 1/3] gperftools deprecated google/* includes
+
+---
+ src/perfglue/heap_profiler.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
+index 6b079b8..cdd5ccb 100644
+--- a/src/perfglue/heap_profiler.cc
++++ b/src/perfglue/heap_profiler.cc
+@@ -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"
+-- 
+1.9.3
+

0002-Wno-format-causes-compiler-options-collision.patch

@@ -0,0 +1,25 @@
+From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 14 Jan 2015 07:47:47 +0100
+Subject: [PATCH 2/3] -Wno-format causes compiler options collision
+
+---
+ src/test/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index 69f9e84..9ede275 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
+ if LINUX
+ ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
+ ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
+-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
++ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
+ bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
+ endif
+ 
+-- 
+1.9.3
+

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

@@ -1,43 +0,0 @@
-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-Backport-pull-request-2937-to-firefly.patch

@@ -0,0 +1,27 @@
+From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 8 Dec 2014 08:36:37 +0100
+Subject: [PATCH 3/3] Backport pull request #2937 to firefly
+
+---
+ src/common/RWLock.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/RWLock.h b/src/common/RWLock.h
+index f901ac0..f4d1937 100644
+--- a/src/common/RWLock.h
++++ b/src/common/RWLock.h
+@@ -36,7 +36,9 @@ public:
+   }
+ 
+   virtual ~RWLock() {
+-    pthread_rwlock_unlock(&L);
++    // The following check is racy but we are about to destroy
++    // the object and we assume that there are no other users.
++    //assert(!is_locked()); -- hacky backport, no is_locked in firefly
+     pthread_rwlock_destroy(&L);
+   }
+ 
+-- 
+1.9.3
+

sources

@@ -1 +1 @@
-ae84a14d93d0b7cc4fa59bac0c79746f  ceph-10.2.4.tar.gz
+cdb6309db1e923ab291bee908cd33f16  ceph-0.80.9.tar.bz2