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-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-src-common-CMakeLists.txt.patch

@@ -1,13 +0,0 @@
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 65ba10b0f1..eeedc29c37 100644
---- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
-     crc32c_aarch64.c)
- endif(HAVE_INTEL)
- 
--add_library(crc32 ${crc32_srcs})
-+add_library(crc32 STATIC ${crc32_srcs})
- if(HAVE_ARMV8_CRC)
-   set_target_properties(crc32 PROPERTIES
-     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")

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
+

0003-src-common-bitstr.h.patch

@@ -1,13 +0,0 @@
---- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
-+++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
-@@ -14,7 +14,10 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
- 
-+#include <cstdint>
-+#include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;

0004-src-librbd-api-PoolMetadata.h.patch

@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 

0005-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,39 +0,0 @@
---- a/cmake/modules/CheckCxxAtomic.cmake	2020-03-02 12:49:20.000000000 -0500
-+++ b/cmake/modules/CheckCxxAtomic.cmake	2020-01-29 12:53:56.952149798 -0500
-@@ -10,18 +10,29 @@
-     check_cxx_source_compiles("
- #include <atomic>
- #include <cstdint>
-+
-+#if __s390x__
-+// Boost needs 16-byte atomics for tagged pointers.
-+// These are implemented via inline instructions on the platform
-+// if 16-byte alignment can be proven, and are delegated to libatomic
-+// library routines otherwise.  Whether or not alignment is provably
-+// OK for a std::atomic unfortunately depends on compiler version and
-+// optimization levels, and also on the details of the expression.
-+// We specifically test access via an otherwise unknown pointer here
-+// to ensure we get the most complex case.  If this access can be
-+// done without libatomic, then all accesses can be done.
-+bool atomic16(std::atomic<unsigned __int128> *ptr)
-+{
-+  return *ptr != 0;
-+}
-+#endif
-+
- int main() {
-   std::atomic<uint8_t> w1;
-   std::atomic<uint16_t> w2;
-   std::atomic<uint32_t> w4;
-   std::atomic<uint64_t> w8;
--#ifdef __s390x__
--  // Boost needs 16-byte atomics for tagged pointers.
--  std::atomic<unsigned __int128> w16;
--#else
--  #define w16 0
--#endif
--  return w1 + w2 + w4 + w8 + w16;
-+  return w1 + w2 + w4 + w8;
- }
- " ${var})
- endfunction(check_cxx_atomics)

sources

@@ -1 +1 @@
-SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
+cdb6309db1e923ab291bee908cd33f16  ceph-0.80.9.tar.bz2