rebuild against gperftools

fixing bug 773194 and updating to 0.39 in the process
Merge branch 'f16' of ssh://pkgs.fedoraproject.org/ceph into origin/f16
2012-02-16 21:36:29 -05:00 · 2012-01-13 14:04:38 -05:00 · 2012-01-13 14:02:10 -05:00 · 2011-11-09 11:57:37 -05:00 · 2011-11-07 12:00:43 -05:00 · 2011-11-07 11:54:54 -05:00
7 changed files with 219 additions and 2920 deletions
@@ -1,2 +1,7 @@
-ceph-*.tar.*
-*.src.rpm
+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
@@ -1,13 +0,0 @@
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 65ba10b0f1..eeedc29c37 100644
--- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -165,7 +165,7 @@ elseif(HAVE_ARMV8_CRC)
-     crc32c_aarch64.c)
- endif(HAVE_INTEL)
- 
-add_library(crc32 ${crc32_srcs})
-+add_library(crc32 STATIC ${crc32_srcs})
- if(HAVE_ARMV8_CRC)
-   set_target_properties(crc32 PROPERTIES
-     COMPILE_FLAGS "${CMAKE_C_FLAGS} ${ARMV8_CRC_COMPILE_FLAGS}")
@@ -1,26 +0,0 @@
-<<<<<<< HEAD
--- ceph-15.1.0/src/common/bit_str.h.orig	2020-02-03 09:47:20.047149798 -0500
-+++ ceph-15.1.0/src/common/bit_str.h	2020-02-03 09:47:50.213149798 -0500
-=======
--- ceph-14.2.6/src/common/bit_str.h.orig	2020-01-24 11:37:20.547679336 -0500
-+++ ceph-14.2.6/src/common/bit_str.h	2020-01-24 11:37:55.351904895 -0500
->>>>>>> origin/f32
-@@ -17,6 +17,7 @@
- #include <cstdint>
- #include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;
--- ceph-15.2.4/src/global/signal_handler.h.orig        2020-07-17 12:57:54.763628429 -0400
-+++ ceph-15.2.4/src/global/signal_handler.h     2020-07-17 12:58:10.610628429 -0400
-@@ -16,6 +16,8 @@
- #define CEPH_GLOBAL_SIGNAL_HANDLER_H
-
- #include <signal.h>
-+#include <string>
-+
- #include "acconfig.h"
-
- typedef void (*signal_handler_t)(int);
@@ -0,0 +1,17 @@
+--- ceph-0.21.1/src/init-ceph.in.orig	2010-07-29 15:16:49.000000000 -0500
+++ ceph-0.21.1/src/init-ceph.in	2010-08-26 14:58:25.328581937 -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 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
@@ -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
+ }
@@ -1 +1 @@
-SHA512 (ceph-14.2.13.tar.gz) = 3d51b729ccf26aa9a40c1320f4051755ec405abc714ae5257ec5433a13549e34fed0945f3091525fd8118d00c36fe4ae793125728d9e17f4221cdd1ee7de5b12
+8dcc078604c54d10085b6990ef554738  ceph-0.39.tar.gz
Author	SHA1	Message	Date
Tom Callaway	79ba39cd11	rebuild against gperftools	2012-02-16 21:36:29 -05:00
David Nalley	f6bd21aaa2	fixing bug 773194 and updating to 0.39 in the process	2012-01-13 14:04:38 -05:00
David Nalley	07057e050a	Merge branch 'f16' of ssh://pkgs.fedoraproject.org/ceph into origin/f16	2012-01-13 14:02:10 -05:00
David Nalley	18879ad313	complying with -static lib guidelines bz: 609700	2011-11-09 11:57:37 -05:00
Josef Bacik	0e4cc7c1b7	-forgot to add the logrotate patch	2011-11-07 12:00:43 -05:00
Josef Bacik	8cb6eae323	-updating ceph in f16 to 0.37	2011-11-07 11:54:54 -05:00