dist-git conversion

.gitignore

@@ -1,2 +1 @@
-ceph-*.tar.*
-*.src.rpm
+ceph-0.20.2.tar.gz

ceph-google-gperftools.patch

@@ -1,13 +0,0 @@
---- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig	2014-08-15 16:05:00.161794290 +0200
-+++ ceph-0.80.5/src/perfglue/heap_profiler.cc	2014-08-15 16:05:04.691794305 +0200
-@@ -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"

ceph-init-fix.patch

@@ -0,0 +1,62 @@
+diff -up ceph-0.20/src/init-ceph.in.init ceph-0.20/src/init-ceph.in
+--- ceph-0.20/src/init-ceph.in.init	2010-04-22 16:11:34.000000000 -0400
++++ ceph-0.20/src/init-ceph.in	2010-05-05 15:37:11.185677759 -0400
+@@ -1,10 +1,11 @@
+ #!/bin/sh
+ # Start/stop ceph daemons
++# chkconfig: - 60 80
+ 
+ ### BEGIN INIT INFO
+ # Provides:          ceph
+-# Default-Start:     2 3 4 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
+@@ -28,6 +29,8 @@ else
+     fi
+ fi
+ 
++lockfile=/var/lock/subsys/ceph
++
+ usage_exit() {
+     echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
+     printf "\t-c ceph.conf\n"
+@@ -244,6 +247,7 @@ for name in $what; do
+ 	    [ -n "$pre_start" ] && do_cmd "$pre_start"
+ 	    do_cmd "$cmd" $runarg
+ 	    [ -n "$post_start" ] && do_cmd "$post_start"
++	    [ "$?" = 0 ] && touch $lockfile
+ 	    ;;
+ 	
+ 	stop)
+@@ -252,19 +256,27 @@ for name in $what; do
+ 	    [ -n "$pre_stop" ] && do_cmd "$pre_stop"
+ 	    stop_daemon $name c$type $pid_file
+ 	    [ -n "$post_stop" ] && do_cmd "$post_stop"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 
++	status)
++	    pid=`cat $pid_file`
++	    ps $pid &> /dev/null
++	    exit $?
++	    ;;
+ 	forcestop)
+ 	    get_conf pre_forcestop "" "pre forcestop command"
+ 	    get_conf post_forcestop "" "post forcestop command"
+ 	    [ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
+ 	    stop_daemon $name c$type $pid_file -9
+ 	    [ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 	    
+ 	killall)
+ 	    echo "killall c$type on $host"
+ 	    do_cmd "pkill ^c$type || true"
++	    [ "$?" = 0 ] && rm -f $lockfile
+ 	    ;;
+ 	
+ 	force-reload | reload)

ceph-no-format-security.patch

@@ -1,11 +0,0 @@
---- ceph-0.80.5/src/test/Makefile.am.orig	2014-08-15 16:30:18.831799418 +0200
-+++ ceph-0.80.5/src/test/Makefile.am	2014-08-15 16:23:17.758464663 +0200
-@@ -642,7 +642,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
- 

ceph-remove-systemd-init-detection.patch

@@ -1,40 +0,0 @@
-From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Fri, 31 Oct 2014 03:27:46 +0100
-Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
-
----
- src/init-ceph.in | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/src/init-ceph.in b/src/init-ceph.in
-index 95723b0..1effb56 100644
---- a/src/init-ceph.in
-+++ b/src/init-ceph.in
-@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
- 
- EXIT_STATUS=0
- 
--# detect systemd
--SYSTEMD=0
--grep -qs systemd /proc/1/comm && SYSTEMD=1
--
- signal_daemon() {
-     name=$1
-     daemon=$2
-@@ -276,11 +272,7 @@ for name in $what; do
- 	    [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
- 	    [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
- 
--	    if [ $SYSTEMD -eq 1 ]; then
--		cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
--	    else
--		cmd="$files $wrap $cmd --cluster $cluster $runmode"
--	    fi
-+	    cmd="$files $wrap $cmd --cluster $cluster $runmode"
- 
- 	    if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
- 		get_conf pre_mount "true" "pre mount command"
--- 
-1.9.3
-

sources

@@ -1 +1 @@
-c57f6887f6097f95ad2c3b169a94f811  ceph-0.80.5.tar.bz2
+74e6f398d320bf1dd46db91210198dd9  ceph-0.20.2.tar.gz