fix detection of C++11 atomic header

.gitignore

@@ -1,2 +1,10 @@
-ceph-*.tar.*
-*.src.rpm
+ceph-0.20.tar.gz
+/ceph-0.21.3.tar.gz
+/ceph-0.25.1.tar.gz
+/ceph-0.26.tar.gz
+/ceph-0.31.tar.gz
+/ceph-0.37.tar.gz
+/ceph-0.39.tar.gz
+/ceph-0.43.tar.bz2
+/ceph-0.44.tar.bz2
+/ceph-0.45.tar.bz2

0001-Makefile-fix-modules-that-cannot-find-pk11pub.h-when.patch

@@ -0,0 +1,52 @@
+From d3bcac241f25f681a585c2115a79befe43dd7d6c Mon Sep 17 00:00:00 2001
+From: Jim Schutt <jaschut@sandia.gov>
+Date: Wed, 21 Mar 2012 10:09:09 -0600
+Subject: [PATCH] Makefile: fix modules that cannot find pk11pub.h when
+ compiling with NSS on RHEL6
+
+Signed-off-by: Jim Schutt <jaschut@sandia.gov>
+Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
+---
+ src/Makefile.am |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a6e6a95..80802bc 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -48,7 +48,7 @@ if LINUX
+ ceph_osd_LDADD += -ldl
+ endif
+ bin_PROGRAMS += ceph-osd
+-ceph_osd_CXXFLAGS = ${AM_CXXFLAGS} \
++ceph_osd_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} \
+ 	-I$(top_srcdir)/src/leveldb/include
+ 
+ # mds
+@@ -111,6 +111,7 @@ osdmaptool_LDADD = $(LIBGLOBAL_LDA)
+ bin_PROGRAMS += monmaptool crushtool osdmaptool
+ 
+ ceph_dencoder_SOURCES = test/encoding/ceph_dencoder.cc
++ceph_dencoder_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+ ceph_dencoder_LDADD = $(LIBGLOBAL_LDA) libosd.la libmds.a libos.la libmon.la
+ bin_PROGRAMS += ceph-dencoder
+ 
+@@ -1002,6 +1003,7 @@ libmon_la_SOURCES = \
+ 	mon/AuthMonitor.cc \
+ 	mon/Elector.cc \
+ 	mon/MonitorStore.cc
++libmon_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+ libmon_la_LIBADD = libglobal.la
+ noinst_LTLIBRARIES += libmon.la
+ 
+@@ -1070,6 +1072,7 @@ libosdc_la_SOURCES = \
+ 	osdc/ObjectCacher.cc \
+ 	osdc/Filer.cc \
+ 	osdc/Journaler.cc
++libosdc_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+ libosdc_la_LIBADD = libcommon.la
+ noinst_LTLIBRARIES += libosdc.la
+ 
+-- 
+1.7.7.6
+

0001-gperftools-deprecated-google-includes.patch

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

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

0003-Backport-pull-request-2937-to-firefly.patch

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

ceph-gxx-atomic.patch

@@ -0,0 +1,51 @@
+diff -up ceph-0.45/src/leveldb/configure.ac.atomic ceph-0.45/src/leveldb/configure.ac
+--- ceph-0.45/src/leveldb/configure.ac.atomic	2012-04-23 18:56:15.000000000 +0200
++++ ceph-0.45/src/leveldb/configure.ac	2012-04-23 19:33:27.000000000 +0200
+@@ -10,11 +10,11 @@ AC_CONFIG_FILES([
+ ])
+ AC_PROG_RANLIB
+ 
+-AC_MSG_CHECKING(whether compiler supports C++11 cstdatomic)
++AC_MSG_CHECKING(whether compiler supports C++11 atomic)
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+-#include <cstdatomic>
++#include <atomic>
+ int main() {}
+ ])], [
+      AC_MSG_RESULT(yes)
+diff -up ceph-0.45/src/leveldb/configure.atomic ceph-0.45/src/leveldb/configure
+--- ceph-0.45/src/leveldb/configure.atomic	2012-04-23 18:56:19.000000000 +0200
++++ ceph-0.45/src/leveldb/configure	2012-04-23 18:56:43.000000000 +0200
+@@ -3885,15 +3885,15 @@ else
+ fi
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 cstdatomic" >&5
+-$as_echo_n "checking whether compiler supports C++11 cstdatomic... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports C++11 atomic" >&5
++$as_echo_n "checking whether compiler supports C++11 atomic... " >&6; }
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++0x"
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#include <cstdatomic>
++#include <atomic>
+ int main() {}
+ 
+ _ACEOF
+diff -up ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic ceph-0.45/src/leveldb/port/atomic_pointer.h
+--- ceph-0.45/src/leveldb/port/atomic_pointer.h.atomic	2012-04-23 18:56:54.000000000 +0200
++++ ceph-0.45/src/leveldb/port/atomic_pointer.h	2012-04-23 18:57:00.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include <stdint.h>
+ #ifdef LEVELDB_CSTDATOMIC_PRESENT
+-#include <cstdatomic>
++#include <atomic>
+ #endif
+ #ifdef OS_WIN
+ #include <windows.h>

ceph-init-fix.patch

@@ -0,0 +1,18 @@
+diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
+--- ceph-0.41/src/init-ceph.in.init	2012-01-17 15:33:20.000000000 -0500
++++ ceph-0.41/src/init-ceph.in	2012-02-16 12:48:50.887279921 -0500
+@@ -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 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

ceph.logrotate.patch

@@ -0,0 +1,11 @@
+--- ./src/logrotate.conf.new	2012-01-11 18:23:10.597593501 -0500
++++ ./src/logrotate.conf	2012-01-11 18:23:26.808390838 -0500
+@@ -4,7 +4,7 @@
+     compress
+     sharedscripts
+     postrotate
+-        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
++        service ceph reload >/dev/null 2>/dev/null || true
+     endscript
+     missingok
+ }

sources

@@ -1 +1 @@
-0bb1d511f39d648035c412c41fd5b8a5  ceph-0.80.10.tar.bz2
+cb15526c87a3c7c8bd739a81be618e26  ceph-0.45.tar.bz2