- fix the sample.conf name

Conflicts:
	ceph.spec

.gitignore

@@ -8,3 +8,9 @@ ceph-0.20.tar.gz
 /ceph-0.43.tar.bz2
 /ceph-0.44.tar.bz2
 /ceph-0.45.tar.bz2
+/ceph-0.46.tar.bz2
+/ceph-0.51.tar.bz2
+/ceph-0.53.tar.bz2
+/ceph-0.56.3.tar.bz2
+/ceph-0.56.4.tar.bz2
+/ceph-0.61.7.tar.bz2

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

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

ceph-build-support-for-automake-1.12.patch

@@ -0,0 +1,13 @@
+diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
+--- ceph-0.51/configure.ac	2012-08-26 01:58:14.000000000 +0300
++++ ceph-0.51b/configure.ac	2012-09-24 09:19:20.791969694 +0300
+@@ -17,6 +17,9 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
++# fix automake problems in 1.12
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++
+ # Automake
+ AM_INIT_AUTOMAKE
+ AM_PROG_CC_C_O

ceph-fix-sbin-target.patch

@@ -0,0 +1,12 @@
+diff -up ceph-0.61.7/src/Makefile.am.fix-sbin ceph-0.61.7/src/Makefile.am
+--- ceph-0.61.7/src/Makefile.am.fix-sbin	2013-07-26 11:52:56.355915758 -0400
++++ ceph-0.61.7/src/Makefile.am	2013-07-26 11:53:09.502808374 -0400
+@@ -28,7 +28,7 @@ bin_PROGRAMS =
+ bin_DEBUGPROGRAMS =
+ sbin_PROGRAMS =
+ # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
+-ceph_sbindir = $(prefix)$(sbindir)
++ceph_sbindir = $(sbindir)
+ ceph_sbin_SCRIPTS = \
+ 	ceph-disk \
+ 	ceph-disk-prepare \

ceph-gxx-atomic.patch

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

@@ -1,6 +1,6 @@
-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
+diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
+--- ceph-0.46/src/init-ceph.in.orig	2012-04-24 16:06:39.000000000 -0400
++++ ceph-0.46/src/init-ceph.in	2012-05-09 16:41:36.500004052 -0400
 @@ -1,11 +1,11 @@
  #!/bin/sh
  # Start/stop ceph daemons
@@ -9,10 +9,10 @@ diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
  
  ### BEGIN INIT INFO
  # Provides:          ceph
--# Default-Start:     2 3 5
+-# Default-Start:     2 3 4 5
 -# Default-Stop:      0 1 6
-+# Default-Start:     
-+# Default-Stop:      
++# 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

@@ -1,11 +0,0 @@
---- ./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

@@ -1,26 +1,26 @@
 Name:          ceph
-Version:       0.45
-Release:       2%{?dist}
+Version:       0.61.7
+Release:       1%{?dist}
 Summary:       User space components of the Ceph file system
 License:       LGPLv2
 Group:         System Environment/Base
-URL:           http://ceph.newdream.net/
+URL:           http://ceph.com/
 
-Source:        http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
+Source:        http://ceph.com/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
+Patch1:        ceph-build-support-for-automake-1.12.patch
+Patch2:        ceph-fix-sbin-target.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
+%ifnarch ppc ppc64 s390 s390x armv7hl
 BuildRequires: gperftools-devel
 %endif
-BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++
+BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++
 BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
 BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
+BuildRequires: leveldb-devel, snappy-devel
 
 Requires(post): chkconfig, binutils, libedit
 Requires(preun): chkconfig
@@ -30,6 +30,18 @@ Requires(preun): initscripts
 Ceph is a distributed network file system designed to provide excellent
 performance, reliability, and scalability.
 
+%package libs
+Summary:       Ceph libraries
+Group:         System Environment/Libraries
+%description libs
+Common libraries for Ceph distributed network file system
+
+%package libcephfs
+Summary:       Ceph libcephfs libraries
+Group:         System Environment/Libraries
+%description libcephfs
+libcephfs library for Ceph distributed network file system
+
 %package       fuse
 Summary:       Ceph fuse-based client
 Group:         System Environment/Base
@@ -43,6 +55,8 @@ Summary:     Ceph headers
 Group:       Development/Libraries
 License:     LGPLv2
 Requires:    %{name} = %{version}-%{release}
+Requires:    %{name}-libs = %{version}-%{release}
+Requires:    %{name}-libcephfs = %{version}-%{release}
 %description devel
 This package contains the headers needed to develop programs that use Ceph.
 
@@ -58,32 +72,11 @@ 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
+%patch1 -p1
+%patch2 -p1
 
 %build
 ./autogen.sh
@@ -97,14 +90,14 @@ EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
 EXTRA_LDFLAGS="-lpthread"
 %endif
 
-%{configure} --prefix=/usr --sbindir=/sbin \
---localstatedir=/var --sysconfdir=/etc \
-%ifarch ppc ppc64 s390 s390x
+%{configure} --prefix=%{_prefix} --sbindir=%{_sbindir} \
+--localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \
+%ifarch ppc ppc64 s390 s390x armv7hl
 --without-tcmalloc \
 %endif
---without-hadoop --with-radosgw --with-gtk2 \
+--with-system-leveldb --without-hadoop --with-radosgw --with-gtk2 \
 CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
-CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
+CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fvisibility-inlines-hidden" \
 LDFLAGS="$EXTRA_LDFLAGS"
 
 make %{?_smp_mflags}
@@ -123,7 +116,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add ceph
 
 %preun
@@ -133,15 +125,20 @@ if [ $1 = 0 ] ; then
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service ceph condrestart >/dev/null 2>&1 || :
 fi
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%post libcephfs -p /sbin/ldconfig
+%postun libcephfs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
 %dir %{_sysconfdir}/ceph
+%dir %{_docdir}/ceph
 %{_bindir}/ceph
 %{_bindir}/cephfs
 %{_bindir}/ceph-conf
@@ -162,15 +159,16 @@ fi
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-coverage
 %{_bindir}/ceph-dencoder
+%{_bindir}/ceph_filestore_dump
+%{_bindir}/ceph_mon_store_converter
 %{_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
+%{_sbindir}/mkcephfs
+%{_sbindir}/mount.ceph
+%{_sbindir}/ceph-disk-activate
+%{_sbindir}/ceph-disk-prepare
+%{_sbindir}/ceph-create-keys
+%{_sbindir}/ceph-disk
+%{_sbindir}/ceph-disk-udev
 %{_libdir}/ceph
 %{_docdir}/ceph/sample.ceph.conf
 %{_docdir}/ceph/sample.fetch_config
@@ -199,46 +197,65 @@ fi
 %{_mandir}/man8/ceph-debugpack.8*
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-dencoder.8*
+%{_mandir}/man8/ceph-rbdnamer.8*
 %{python_sitelib}/rados.py*
-%{python_sitelib}/rgw.py*
 %{python_sitelib}/rbd.py*
+%{python_sitelib}/cephfs.py*
 %dir %{_localstatedir}/lib/ceph/
 %dir %{_localstatedir}/lib/ceph/tmp/
 %dir %{_localstatedir}/log/ceph/
 
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/librados.so.*
+%{_libdir}/librbd.so.*
+%{_libdir}/rados-classes/libcls_rbd.so.*
+%{_libdir}/rados-classes/libcls_rgw.so*
+%{_libdir}/rados-classes/libcls_lock*
+%{_libdir}/rados-classes/libcls_kvs*
+%{_libdir}/rados-classes/libcls_refcount*
+
+%files libcephfs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libcephfs.so.*
+
 %files fuse
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/ceph-fuse
+%{_bindir}/rbd-fuse
+%{_sbindir}/mount.fuse.ceph
 %{_mandir}/man8/ceph-fuse.8*
+%{_mandir}/man8/rbd-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}/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/rados_types.h
+%{_includedir}/rados/rados_types.hpp
 %{_includedir}/rados/buffer.h
 %{_includedir}/rados/page.h
 %{_includedir}/rados/crc32c.h
-%{_includedir}/rados/librgw.h
+#%{_includedir}/rados/librgw.h
 %{_includedir}/rbd/librbd.h
 %{_includedir}/rbd/librbd.hpp
+%{_includedir}/rbd/features.h
 %{_libdir}/libcephfs.so
 %{_libdir}/librados.so
-%{_libdir}/librgw.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,-)
@@ -246,12 +263,44 @@ fi
 %{_bindir}/radosgw-admin
 %{_sysconfdir}/bash_completion.d/radosgw-admin
 
-%files obsync
-%defattr(-,root,root,-)
-%{_bindir}/obsync
-%{_bindir}/boto_tool
-
 %changelog
+* Mon Jul 29 2013 Josef Bacik <josef@toxicpanda.com> - 0.61.7-1
+- Update to 0.61.7
+
+* Sat Jul 27 2013 pmachata@redhat.com - 0.56.4-2
+- Rebuild for boost 1.54.0
+
+* Fri Mar 29 2013 Josef Bacik <josef@toxicpanda.com> - 0.56.4-1
+- Update to 0.56.4
+- Add upstream d02340d90c9d30d44c962bea7171db3fe3bfba8e to fix logrotate
+
+* Wed Feb 20 2013 Josef Bacik <josef@toxicpanda.com> - 0.56.3-1
+- Update to 0.56.3
+
+* Mon Feb 11 2013 Richard W.M. Jones <rjones@redhat.com> - 0.53-2
+- Rebuilt to try to fix boost dependency problem in Rawhide.
+
+* Thu Nov  1 2012 Josef Bacik <josef@toxicpanda.com> - 0.53-1
+- Update to 0.53
+
+* Mon Sep 24 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.51-3
+- Fix automake 1.12 error
+- Rebuild after buildroot was messed up
+
+* Tue Sep 18 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.51-2
+- Use system leveldb
+
+* Fri Sep 07 2012 David Nalley <david@gnsa.us> - 0.51-1
+- Updating to 0.51
+- Updated url and source url. 
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.46-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed May  9 2012 Josef Bacik <josef@toxicpanda.com> - 0.46-1
+- updated to upstream 0.46
+- broke out libcephfs (rhbz# 812975)
+
 * Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 0.45-2
 - fix detection of C++11 atomic header
 
@@ -346,7 +395,7 @@ fi
 - Include rbdtool
 - Remove misc debugging, test binaries
 
-* Thu Apr 30 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-4
+* Fri 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

sources

@@ -1 +1 @@
-cb15526c87a3c7c8bd739a81be618e26  ceph-0.45.tar.bz2
+1c00b9db5a65b03448226d828e274fe2  ceph-0.61.7.tar.bz2