- updated to 0.58

- updated logrotate,link patches

diff --git a/ceph-link.patch b/ceph-link.patch
index 3c508f18dd91f50b886445a50d8c7b9fa7ee9b0a..ae244f8287947296b092a7e9e837048ee4c7b8ea 100644 (file)
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -1,6 +1,6 @@
---- ceph-0.56/src/Makefile.am.orig     2013-01-01 01:52:55.000000000 +0100
-+++ ceph-0.56/src/Makefile.am  2013-01-06 14:47:20.347970073 +0100
-@@ -55,7 +55,7 @@
+--- ceph-0.58/src/Makefile.am.orig     2013-03-05 00:01:56.000000000 +0100
++++ ceph-0.58/src/Makefile.am  2013-03-08 22:33:39.131959554 +0100
+@@ -56,7 +56,7 @@
  EXTRALIBS += -lprofiler
  endif
  
@@ -9,16 +9,16 @@
  
  LIBOS_LDA = libos.a
  
-@@ -138,7 +138,7 @@
+@@ -146,7 +146,7 @@
  bin_PROGRAMS += cephfs
  
  librados_config_SOURCES = librados-config.cc
--librados_config_LDADD = libglobal.la librados.la $(EXTRALIBS) $(CRYPTO_LIBS)
-+librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(EXTRALIBS) $(CRYPTO_LIBS)
+-librados_config_LDADD = libglobal.la librados.la $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS)
++librados_config_LDADD = librados.la $(LIBGLOBAL_LDA) $(PTHREAD_LIBS) $(EXTRALIBS) $(CRYPTO_LIBS)
  bin_PROGRAMS += librados-config
  
  # synthetic client
-@@ -296,7 +296,7 @@
+@@ -313,7 +313,7 @@
  libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
  libcephfs_la_CXXFLAGS= ${AM_CXXFLAGS}
  libcephfs_la_LIBADD = libclient.la
@@ -27,7 +27,7 @@
              ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
  lib_LTLIBRARIES += libcephfs.la
  
-@@ -318,7 +318,7 @@
+@@ -335,7 +335,7 @@
  librados_la_SOURCES = ${librados_SOURCES}
  librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
  librados_la_CXXFLAGS = ${AM_CXXFLAGS}

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index e869408c1d681891f3eccae4a227016377646fb0..6bddd00f1bbb1cec8781754cdf5634966ea9ed33 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,25 +1,23 @@
---- ceph-0.56/src/logrotate.conf.orig  2013-01-06 13:46:50.321379068 +0100
-+++ ceph-0.56/src/logrotate.conf       2013-01-06 14:46:15.021304770 +0100
-@@ -4,23 +4,7 @@
+--- ceph-0.58/src/logrotate.conf.orig  2013-03-08 22:30:48.205300063 +0100
++++ ceph-0.58/src/logrotate.conf       2013-03-08 22:31:18.038632150 +0100
+@@ -4,21 +4,7 @@
      compress
      sharedscripts
      postrotate
--        if which invoke-rc.d > /dev/null && [ -x `which invoke-rc.d` ]; then
+-        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
 -            invoke-rc.d ceph reload >/dev/null
--        elif which service > /dev/null && [ -x `which service` ]; then
+-        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
 -            service ceph reload >/dev/null
 -        fi
 -        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
--        if which initctl > /dev/null && [ -x `which initctl` ]; then
+-        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
 -            # upstart reload isn't very helpful here:
 -            #   https://bugs.launchpad.net/upstart/+bug/1012938
--            for type in mon osd mds; do
--              initctl list \
--                  | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
--                  | while read l; do
--                  initctl reload -- $l 2>/dev/null || :
--              done
--            done
+-          initctl list \
+-              | sed -n 's/^\(ceph-\(mon\|osd\|mds\)\+\)[ \t]\+(\([^ \/]\+\)\/\([^ \/]\+\))[ \t]\+start\/.*$/\1 cluster=\3 id=\4/p' \
+-              | while read l; do
+-              initctl reload -- $l 2>/dev/null || :
+-          done
 -        fi
 +        service ceph reload >/dev/null 2>/dev/null
      endscript

diff --git a/ceph.spec b/ceph.spec
index 424dc6e0195b0f1e98a823f998a15f29f67a90ba..9f42c11efde51adc03da5726525b25001b94d7ac 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -6,12 +6,12 @@
 Summary:       User space components of the Ceph file system
 Summary(pl.UTF-8):     Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:          ceph
-Version:       0.57
+Version:       0.58
 Release:       1
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 030c4cf11b37f26cbf202e7c68d9cf2e
+# Source0-md5: 86c03dbae51545dadfd3ff27371bf15b
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
 Patch2:                %{name}-link.patch
@@ -269,13 +269,13 @@ fi
 %attr(755,root,root) %{_bindir}/ceph-coverage
 %attr(755,root,root) %{_bindir}/ceph-debugpack
 %attr(755,root,root) %{_bindir}/ceph-dencoder
-%attr(755,root,root) %{_bindir}/ceph-filestore-dump
 %attr(755,root,root) %{_bindir}/ceph-mds
 %attr(755,root,root) %{_bindir}/ceph-mon
 %attr(755,root,root) %{_bindir}/ceph-osd
 %attr(755,root,root) %{_bindir}/ceph-rbdnamer
 %attr(755,root,root) %{_bindir}/ceph-run
 %attr(755,root,root) %{_bindir}/ceph-syn
+%attr(755,root,root) %{_bindir}/ceph_filestore_dump
 %attr(755,root,root) %{_bindir}/cephfs
 %attr(755,root,root) %{_bindir}/crushtool
 %attr(755,root,root) %{_bindir}/librados-config