fix detection of C++11 atomic header

Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>

.gitignore

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ceph
-# $Id$
-NAME := ceph
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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
+ }

ceph.spec

@@ -0,0 +1,365 @@
+Name:          ceph
+Version:       0.45
+Release:       2%{?dist}
+Summary:       User space components of the Ceph file system
+License:       LGPLv2
+Group:         System Environment/Base
+URL:           http://ceph.newdream.net/
+
+Source:        http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
+Patch0:        ceph-init-fix.patch
+Patch1:        ceph.logrotate.patch
+# http://tracker.newdream.net/issues/2329
+Patch2:        ceph-gxx-atomic.patch
+
+BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, 
+BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
+# google-perftools is not available on these:
+%ifnarch ppc ppc64 s390 s390x
+BuildRequires: gperftools-devel
+%endif
+BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++
+BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
+BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
+
+Requires(post): chkconfig, binutils, libedit
+Requires(preun): chkconfig
+Requires(preun): initscripts
+
+%description
+Ceph is a distributed network file system designed to provide excellent
+performance, reliability, and scalability.
+
+%package       fuse
+Summary:       Ceph fuse-based client
+Group:         System Environment/Base
+Requires:      %{name} = %{version}-%{release}
+BuildRequires: fuse-devel
+%description   fuse
+FUSE based client for Ceph distributed network file system
+
+%package     devel
+Summary:     Ceph headers
+Group:       Development/Libraries
+License:     LGPLv2
+Requires:    %{name} = %{version}-%{release}
+%description devel
+This package contains the headers needed to develop programs that use Ceph.
+
+%package radosgw
+Summary:        rados REST gateway
+Group:          Development/Libraries
+Requires:       mod_fcgid
+BuildRequires:  fcgi-devel
+BuildRequires:  expat-devel
+
+%description radosgw
+radosgw is an S3 HTTP REST gateway for the RADOS object store. It is
+implemented as a FastCGI module using libfcgi, and can be used in
+conjunction with any FastCGI capable web server.
+
+%package obsync
+Summary:        synchronize data between cloud object storage providers or a local directory
+Group:          Productivity/Networking/Other
+License:        LGPLv2
+Requires:       python, python-boto
+%description obsync
+obsync is a tool to synchronize objects between cloud object
+storage providers, such as Amazon S3 (or compatible services), a
+Ceph RADOS cluster, or a local directory.
+
+%package gcephtool
+Summary:        Ceph graphical monitoring tool
+Group:          System Environment/Base
+License:        LGPLv2
+Requires:       gtk2 gtkmm24
+BuildRequires:  gtk2-devel gtkmm24-devel
+
+%description gcephtool
+gcephtool is a graphical monitor for the clusters running the Ceph distributed
+file system.
+
+%prep
+%setup -q
+%patch0 -p1 -b .init
+%patch1 -p0
+%patch2 -p1 -b .atomic
+
+%build
+./autogen.sh
+
+%ifarch armv5tel
+# libatomic_ops does not have correct asm for ARMv5tel
+EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
+%endif
+%ifarch %{arm}
+# libatomic_ops seems to fallback on some pthread implementation on ARM
+EXTRA_LDFLAGS="-lpthread"
+%endif
+
+%{configure} --prefix=/usr --sbindir=/sbin \
+--localstatedir=/var --sysconfdir=/etc \
+%ifarch ppc ppc64 s390 s390x
+--without-tcmalloc \
+%endif
+--without-hadoop --with-radosgw --with-gtk2 \
+CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
+CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
+LDFLAGS="$EXTRA_LDFLAGS"
+
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
+chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf
+install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/stat
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add ceph
+
+%preun
+if [ $1 = 0 ] ; then
+    /sbin/service ceph stop >/dev/null 2>&1
+    /sbin/chkconfig --del ceph
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ] ; then
+    /sbin/service ceph condrestart >/dev/null 2>&1 || :
+fi
+
+%files
+%defattr(-,root,root,-)
+%doc README COPYING
+%dir %{_sysconfdir}/ceph
+%{_bindir}/ceph
+%{_bindir}/cephfs
+%{_bindir}/ceph-conf
+%{_bindir}/ceph-clsinfo
+%{_bindir}/crushtool
+%{_bindir}/monmaptool
+%{_bindir}/osdmaptool
+%{_bindir}/ceph-authtool
+%{_bindir}/ceph-syn
+%{_bindir}/ceph-run
+%{_bindir}/ceph-mon
+%{_bindir}/ceph-mds
+%{_bindir}/ceph-osd
+%{_bindir}/ceph-rbdnamer
+%{_bindir}/librados-config
+%{_bindir}/rados
+%{_bindir}/rbd
+%{_bindir}/ceph-debugpack
+%{_bindir}/ceph-coverage
+%{_bindir}/ceph-dencoder
+%{_initrddir}/ceph
+%{_libdir}/libcephfs.so.*
+%{_libdir}/librados.so.*
+%{_libdir}/librbd.so.*
+%{_libdir}/librgw.so.*
+%{_libdir}/rados-classes/libcls_rbd.so.*
+%{_libdir}/rados-classes/libcls_rgw.so*
+/sbin/mkcephfs
+/sbin/mount.ceph
+%{_libdir}/ceph
+%{_docdir}/ceph/sample.ceph.conf
+%{_docdir}/ceph/sample.fetch_config
+%config(noreplace) %{_sysconfdir}/logrotate.d/ceph
+%config(noreplace) %{_sysconfdir}/bash_completion.d/rados
+%config(noreplace) %{_sysconfdir}/bash_completion.d/ceph
+%config(noreplace) %{_sysconfdir}/bash_completion.d/rbd
+%{_mandir}/man8/ceph-mon.8*
+%{_mandir}/man8/ceph-mds.8*
+%{_mandir}/man8/ceph-osd.8*
+%{_mandir}/man8/mkcephfs.8*
+%{_mandir}/man8/ceph-run.8*
+%{_mandir}/man8/ceph-syn.8*
+%{_mandir}/man8/crushtool.8*
+%{_mandir}/man8/osdmaptool.8*
+%{_mandir}/man8/monmaptool.8*
+%{_mandir}/man8/ceph-conf.8*
+%{_mandir}/man8/ceph.8*
+%{_mandir}/man8/cephfs.8*
+%{_mandir}/man8/mount.ceph.8*
+%{_mandir}/man8/radosgw.8*
+%{_mandir}/man8/radosgw-admin.8*
+%{_mandir}/man8/rados.8*
+%{_mandir}/man8/rbd.8*
+%{_mandir}/man8/ceph-authtool.8*
+%{_mandir}/man8/ceph-debugpack.8*
+%{_mandir}/man8/ceph-clsinfo.8*
+%{_mandir}/man8/ceph-dencoder.8*
+%{python_sitelib}/rados.py*
+%{python_sitelib}/rgw.py*
+%{python_sitelib}/rbd.py*
+%dir %{_localstatedir}/lib/ceph/
+%dir %{_localstatedir}/lib/ceph/tmp/
+%dir %{_localstatedir}/log/ceph/
+
+%files fuse
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/ceph-fuse
+%{_mandir}/man8/ceph-fuse.8*
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_includedir}/cephfs/libcephfs.h
+%{_includedir}/crush/crush.h
+%{_includedir}/crush/hash.h
+%{_includedir}/crush/mapper.h
+%{_includedir}/crush/types.h
+%{_includedir}/rados/librados.h
+%{_includedir}/rados/librados.hpp
+%{_includedir}/rados/buffer.h
+%{_includedir}/rados/page.h
+%{_includedir}/rados/crc32c.h
+%{_includedir}/rados/librgw.h
+%{_includedir}/rbd/librbd.h
+%{_includedir}/rbd/librbd.hpp
+%{_libdir}/libcephfs.so
+%{_libdir}/librados.so
+%{_libdir}/librgw.so
+%{_libdir}/librbd.so*
+%{_libdir}/rados-classes/libcls_rbd.so
+%{_mandir}/man8/librados-config.8*
+
+%files gcephtool
+%defattr(-,root,root,-)
+%{_bindir}/gceph
+%{_datadir}/ceph_tool/gui_resources/*
+
+%files radosgw
+%defattr(-,root,root,-)
+%{_bindir}/radosgw
+%{_bindir}/radosgw-admin
+%{_sysconfdir}/bash_completion.d/radosgw-admin
+
+%files obsync
+%defattr(-,root,root,-)
+%{_bindir}/obsync
+%{_bindir}/boto_tool
+
+%changelog
+* Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 0.45-2
+- fix detection of C++11 atomic header
+
+* Thu Apr 12 2012 Josef Bacik <josef@toxicpanda.com> - 0.45-1
+- updating to upstream 0.45
+
+* Wed Apr  4 2012 Niels de Vos <devos@fedoraproject.org> - 0.44-5
+- Add LDFLAGS=-lpthread on any ARM architecture
+- Add CFLAGS=-DAO_USE_PTHREAD_DEFS on ARMv5tel
+
+* Mon Mar 26 2012 Dan Horák <dan[at]danny.cz> 0.44-4
+- gperftools not available also on ppc
+
+* Mon Mar 26 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-3
+- Remove unneeded patch
+
+* Sun Mar 25 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-2
+- Update to 0.44
+- Fix build problems
+
+* Mon Mar  5 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.43-1
+- Update to 0.43
+- Remove upstreamed compile fixes patch
+- Remove obsoleted dump_pop patch
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.41-2
+- Rebuilt for c++ ABI breakage
+
+* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.41-1
+- update to 0.41
+- fix issues preventing build
+- rebuild against gperftools
+
+* Sat Dec 03 2011 David Nalley <david@gnsa.us> 0.38-1
+- updating to upstream 0.39
+
+* Sat Nov 05 2011 David Nalley <david@gnsa.us> 0.37-1
+- create /etc/ceph - bug 745462
+- upgrading to 0.37, fixing 745460, 691033
+- fixing various logrotate bugs 748930, 747101
+
+* Fri Aug 19 2011 Dan Horák <dan[at]danny.cz> 0.31-4
+- google-perftools not available also on s390(x)
+
+* Mon Jul 25 2011 Karsten Hopp <karsten@redhat.com> 0.31-3
+- build without tcmalloc on ppc64, BR google-perftools is not available there
+
+* Tue Jul 12 2011 Josef Bacik <josef@toxicpanda.com> 0.31-2
+- Remove curl/types.h include since we don't use it anymore
+
+* Tue Jul 12 2011 Josef Bacik <josef@toxicpanda.com> 0.31-1
+- Update to 0.31
+
+* Tue Apr  5 2011 Josef Bacik <josef@toxicpanda.com> 0.26-2
+- Add the compile fix patch
+
+* Tue Apr  5 2011 Josef Bacik <josef@toxicpanda.com> 0.26
+- Update to 0.26
+
+* Tue Mar 22 2011 Josef Bacik <josef@toxicpanda.com> 0.25.1-1
+- Update to 0.25.1
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Sep 29 2010 Steven Pritchard <steve@kspei.com> 0.21.3-1
+- Update to 0.21.3.
+
+* Mon Aug 30 2010 Steven Pritchard <steve@kspei.com> 0.21.2-1
+- Update to 0.21.2.
+
+* Thu Aug 26 2010 Steven Pritchard <steve@kspei.com> 0.21.1-1
+- Update to 0.21.1.
+- Sample configs moved to /usr/share/doc/ceph/.
+- Added cclass, rbd, and cclsinfo.
+- Dropped mkmonfs and rbdtool.
+- mkcephfs moved to /sbin.
+- Add libcls_rbd.so.
+
+* Tue Jul  6 2010 Josef Bacik <josef@toxicpanda.com> 0.20.2-1
+- update to 0.20.2
+
+* Wed May  5 2010 Josef Bacik <josef@toxicpanda.com> 0.20-1
+- update to 0.20
+- disable hadoop building
+- remove all the test binaries properly
+
+* Fri Apr 30 2010 Sage Weil <sage@newdream.net> 0.19.1-5
+- Remove java deps (no need to build hadoop by default)
+- Include all required librados helpers
+- Include fetch_config sample
+- Include rbdtool
+- Remove misc debugging, test binaries
+
+* Thu Apr 30 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-4
+- Add java-devel and java tricks to get hadoop to build
+
+* Mon Apr 26 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-3
+- Move the rados and cauthtool man pages into the base package
+
+* Sun Apr 25 2010 Jonathan Dieter <jdieter@lesbg.com> 0.19.1-2
+- Add missing libhadoopcephfs.so* to file list
+- Add COPYING to all subpackages
+- Fix ownership of /usr/lib[64]/ceph
+- Enhance description of fuse client
+
+* Tue Apr 20 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-1
+- Update to 0.19.1
+
+* Mon Feb  8 2010 Josef Bacik <josef@toxicpanda.com> 0.18-1
+- Initial spec file creation, based on the template provided in the ceph src

sources

@@ -0,0 +1 @@
+cb15526c87a3c7c8bd739a81be618e26  ceph-0.45.tar.bz2