New release (1:0.94.7-2)

- Workaround xfs.h check

0001-Disable-erasure_codelib-neon-build.patch

@@ -0,0 +1,29 @@
+From 8ac49f54ad774324c1de344cd18620df7fa52256 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 15 Apr 2015 14:06:24 +0200
+Subject: [PATCH] Disable erasure_codelib neon build
+
+---
+ src/erasure-code/jerasure/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
+index 9ca4fbb..147d57e 100644
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
+@@ -75,9 +75,9 @@ if LINUX
+ libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+-if HAVE_NEON
+-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
+-endif
++#if HAVE_NEON
++#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
++#endif
+ 
+ libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+-- 
+2.5.5
+

0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch

@@ -0,0 +1,37 @@
+From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
+From: Anthony Alba <ascanio.alba7@gmail.com>
+Date: Mon, 30 Nov 2015 16:44:31 +0800
+Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
+
+Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index e4cea7e..1f19ffa 100644
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -288,7 +288,7 @@ for name in $what; do
+ 	lockfile=""
+     fi
+ 
+-    get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
++    get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
+ 
+     case "$command" in
+ 	start)
+@@ -404,8 +404,8 @@ for name in $what; do
+ 		# these keys.  it's also true for legacy installs
+ 		# via mkcephfs, which is fine too; there is no harm
+ 		# in creating these keys.
+-		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
+-		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
++		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
++		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
+ 		    echo Starting ceph-create-keys on $host...
+ 		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
+ 		    do_cmd "$cmd2"
+-- 
+2.5.5
+

0002-src-common-CMakeLists.txt.patch

@@ -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}")

0003-Apply-ceph-0.94.1-tcmalloc.patch.patch

@@ -0,0 +1,26 @@
+From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:47:20 +0200
+Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/rocksdb/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
+index 855c6a8..fe914aa 100644
+--- a/src/rocksdb/configure.ac
++++ b/src/rocksdb/configure.ac
+@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
+ AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
+ AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
+ AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
+-AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
++AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
+ 
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+-- 
+2.5.5
+

0003-src-common-bitstr.h.patch

@@ -1,13 +0,0 @@
---- 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
-@@ -14,7 +14,10 @@
- #ifndef CEPH_COMMON_BIT_STR_H
- #define CEPH_COMMON_BIT_STR_H
- 
-+#include <cstdint>
-+#include <iosfwd>
- #include <functional>
-+#include <ostream>
- 
- namespace ceph {
-   class Formatter;

0004-Apply-init-ceph.in-fedora.patch.patch

@@ -0,0 +1,32 @@
+From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:48:23 +0200
+Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index 1f19ffa..78eaf97 100644
+--- a/src/init-ceph.in
++++ b/src/init-ceph.in
+@@ -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
+-- 
+2.5.5
+

0004-src-librbd-api-PoolMetadata.h.patch

@@ -1,10 +0,0 @@
---- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig	2020-01-24 12:39:23.738816885 -0500
-+++ ceph-14.2.6/src/librbd/api/PoolMetadata.h	2020-01-24 12:39:36.522902386 -0500
-@@ -8,6 +8,7 @@
- #include "include/rados/librados_fwd.hpp"
- 
- #include <map>
-+#include <string>
- 
- namespace librbd {
- 

0005-Workaround-xfs.h-check.patch

@@ -0,0 +1,36 @@
+From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 20:53:28 +0200
+Subject: [PATCH] Workaround xfs.h check
+
+The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
+
+http://www.spinics.net/lists/ceph-devel/msg29467.html
+
+This should not be too critical and the package should build just fine
+anyway. Commenting out the bits that check for xfs.h should help us,
+here.
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d1f98aa..e068fdb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
+   [with_libxfs=yes])
+ AS_IF([test "x$with_libxfs" != "xno"], [
+   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
+-  AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+-    [xfs/xfs.h not found (--without-libxfs to disable)]))
++  #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
++  #  [xfs/xfs.h not found (--without-libxfs to disable)]))
+   AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
+   AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
+     #include <xfs/xfs.h>
+-- 
+2.5.5
+

0005-cmake-modules-CheckCxxAtomic.cmake.patch

@@ -1,39 +0,0 @@
---- a/cmake/modules/CheckCxxAtomic.cmake	2020-03-02 12:49:20.000000000 -0500
-+++ b/cmake/modules/CheckCxxAtomic.cmake	2020-01-29 12:53:56.952149798 -0500
-@@ -10,18 +10,29 @@
-     check_cxx_source_compiles("
- #include <atomic>
- #include <cstdint>
-+
-+#if __s390x__
-+// Boost needs 16-byte atomics for tagged pointers.
-+// These are implemented via inline instructions on the platform
-+// if 16-byte alignment can be proven, and are delegated to libatomic
-+// library routines otherwise.  Whether or not alignment is provably
-+// OK for a std::atomic unfortunately depends on compiler version and
-+// optimization levels, and also on the details of the expression.
-+// We specifically test access via an otherwise unknown pointer here
-+// to ensure we get the most complex case.  If this access can be
-+// done without libatomic, then all accesses can be done.
-+bool atomic16(std::atomic<unsigned __int128> *ptr)
-+{
-+  return *ptr != 0;
-+}
-+#endif
-+
- int main() {
-   std::atomic<uint8_t> w1;
-   std::atomic<uint16_t> w2;
-   std::atomic<uint32_t> w4;
-   std::atomic<uint64_t> w8;
--#ifdef __s390x__
--  // Boost needs 16-byte atomics for tagged pointers.
--  std::atomic<unsigned __int128> w16;
--#else
--  #define w16 0
--#endif
--  return w1 + w2 + w4 + w8 + w16;
-+  return w1 + w2 + w4 + w8;
- }
- " ${var})
- endfunction(check_cxx_atomics)

sources

@@ -1 +1,3 @@
-SHA512 (ceph-14.2.9.tar.gz) = 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
+e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
+566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
+a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz