updated to 0.51.

diff --git a/ceph-compile-fixes.patch b/ceph-compile-fixes.patch
deleted file mode 100644 (file)
index 7f00bd6..0000000
--- a/ceph-compile-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -up ceph-0.41/src/cephfs.cc.compilefix ceph-0.41/src/cephfs.cc
---- ceph-0.41/src/cephfs.cc.compilefix 2012-02-16 21:08:19.983652818 -0500
-+++ ceph-0.41/src/cephfs.cc    2012-02-16 21:08:31.917550083 -0500
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "client/ioctl.h"
- 
- using namespace std;
-diff -up ceph-0.41/src/common/safe_io.h.compilefix ceph-0.41/src/common/safe_io.h
---- ceph-0.41/src/common/safe_io.h.compilefix  2012-02-16 12:53:31.456514774 -0500
-+++ ceph-0.41/src/common/safe_io.h     2012-02-16 12:54:00.045233017 -0500
-@@ -16,6 +16,7 @@
- #define CEPH_SAFE_IO
- 
- #include "common/compiler_extensions.h"
-+#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -up ceph-0.41/src/osd/PG.cc.compilefix ceph-0.41/src/osd/PG.cc
---- ceph-0.41/src/osd/PG.cc.compilefix 2012-02-16 20:58:21.039559849 -0500
-+++ ceph-0.41/src/osd/PG.cc    2012-02-16 20:59:07.920149937 -0500
-@@ -4830,13 +4830,13 @@ bool PG::PriorSet::affected_by_map(const
-     }
- 
-     // did a down osd in cur get (re)marked as lost?
--    map<int,epoch_t>::const_iterator p = blocked_by.find(o);
--    if (p != blocked_by.end()) {
-+    map<int,epoch_t>::const_iterator r = blocked_by.find(o);
-+    if (r != blocked_by.end()) {
-       if (!osdmap->exists(o)) {
-       dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
-       return true;
-       }
--      if (osdmap->get_info(o).lost_at != p->second) {
-+      if (osdmap->get_info(o).lost_at != r->second) {
-       dout(10) << "affected_by_map osd." << o << " (re)marked as lost" << dendl;
-       return true;
-       }
-diff -up ceph-0.41/src/osd/ReplicatedPG.cc.compilefix ceph-0.41/src/osd/ReplicatedPG.cc
---- ceph-0.41/src/osd/ReplicatedPG.cc.compilefix       2012-02-16 21:03:26.140892128 -0500
-+++ ceph-0.41/src/osd/ReplicatedPG.cc  2012-02-16 21:04:45.190200945 -0500
-@@ -5436,8 +5436,8 @@ int ReplicatedPG::recover_replicas(int m
-       }
- 
-       dout(10) << __func__ << ": recover_object_replicas(" << soid << ")" << dendl;
--      map<hobject_t,Missing::item>::const_iterator p = m.missing.find(soid);
--      started += recover_object_replicas(soid, p->second.need);
-+      map<hobject_t,Missing::item>::const_iterator r = m.missing.find(soid);
-+      started += recover_object_replicas(soid, r->second.need);
-     }
-   }
- 
-diff -up ceph-0.41/src/test/system/systest_runnable.cc.compilefix ceph-0.41/src/test/system/systest_runnable.cc
---- ceph-0.41/src/test/system/systest_runnable.cc.compilefix   2012-02-16 12:54:35.430884275 -0500
-+++ ceph-0.41/src/test/system/systest_runnable.cc      2012-02-16 12:54:45.923780862 -0500
-@@ -28,6 +28,7 @@
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <unistd.h>
- #include <vector>
- 
- #if defined(__FreeBSD__)

diff --git a/ceph-init-fix.patch b/ceph-init-fix.patch
index 3d22e19b0608ffcac5caf67e94c32ef4b77c0746..b4752bec854574c3851fcc4152fb113f81789e1e 100644 (file)
--- a/ceph-init-fix.patch
+++ b/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

diff --git a/ceph-link.patch b/ceph-link.patch
index c2c41328108030332849bf985abd3590cbcec457..928b3f03647e1a5fe53f88bc3126c0c3dd0b71d9 100644 (file)
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -1,11 +1,29 @@
---- ceph-0.41/src/Makefile.am~ 2012-01-27 21:35:39.000000000 +0100
-+++ ceph-0.41/src/Makefile.am  2012-02-23 09:55:11.768753394 +0100
-@@ -116,7 +116,7 @@
+--- ceph-0.51/src/Makefile.am.orig     2012-08-26 00:58:03.000000000 +0200
++++ ceph-0.51/src/Makefile.am  2012-09-10 18:52:40.813987974 +0200
+@@ -53,7 +53,7 @@
+ EXTRALIBS += -lprofiler
+ endif
+ 
+-LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
++LIBGLOBAL_LDA = libglobal.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
+ 
+ LIBOS_LDA = libos.a
+ 
+@@ -137,7 +137,7 @@
  bin_PROGRAMS += cephfs
  
  librados_config_SOURCES = librados-config.cc
 -librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
-+librados_config_LDADD = $(LIBGLOBAL_LDA) librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
++librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(EXTRALIBS) $(CRYPTO_LIBS)
  bin_PROGRAMS += librados-config
  
  # synthetic client
+@@ -293,7 +293,7 @@
+ librados_la_SOURCES = ${librados_SOURCES}
+ librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
+ librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
+-librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
++librados_la_LIBADD = libcommon.la $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system
+ librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0 -export-symbols-regex '^rados_.*'
+ lib_LTLIBRARIES += librados.la
+ 

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 6ded86e616ae7bdcea1fc34082e25604609c8759..1cdb7d1bc7d12eec49d7a9e0970ac4be9a8fd305 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +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
+--- src/logrotate.conf 2012-07-03 00:22:59.000000000 -0400
++++ src/logrotate.conf.new     2012-09-09 12:56:09.912929358 -0400
 @@ -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
- }
+ 
+       # upstart reload isn't very helpful here:
+       #   https://bugs.launchpad.net/upstart/+bug/1012938

diff --git a/ceph.spec b/ceph.spec
index 559c4755e8afb5edf4afdc19ceebba30432af906..3056bd6e08657aa8b81aec2cdf7b3d0525e742a5 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,15 +1,14 @@
 Summary:       User space components of the Ceph file system
 Name:          ceph
-Version:       0.41
+Version:       0.51
 Release:       1
 License:       LGPLv2
 Group:         Base
 Source0:       http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 12730a25f7c82549a08b0d8b8c09d69f
+# Source0-md5: e4d07eccd79c9a4a9eeee4066f2a13a3
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
-Patch2:                %{name}-compile-fixes.patch
-Patch3:                %{name}-link.patch
+Patch2:                %{name}-link.patch
 URL:           http://ceph.newdream.net/
 BuildRequires: boost-devel
 BuildRequires: cryptopp-devel
@@ -121,7 +120,6 @@ distributed file system.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}