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
+

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
+

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
+

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
+

ceph-0.81.0-Makefile.in.patch

@@ -1,40 +0,0 @@
---- ceph-0.81/src/Makefile.in.orig	2014-07-02 09:07:44.888133273 -0400
-+++ ceph-0.81/src/Makefile.in	2014-07-03 13:32:30.213133273 -0400
-@@ -3875,6 +3875,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
-@@ -4928,7 +4929,7 @@
- @LINUX_TRUE@ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- @LINUX_TRUE@nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- @LINUX_TRUE@ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
--@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc
- ceph_test_cls_rbd_LDADD = $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
- ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS)
---- ceph-0.81/src/Makefile-env.am.orig	2014-07-02 09:23:02.126133273 -0400
-+++ ceph-0.81/src/Makefile-env.am	2014-07-03 11:50:14.063133273 -0400
-@@ -64,6 +64,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
---- ceph-0.81/src/test/Makefile.am.orig	2014-07-04 06:36:22.016099589 -0400
-+++ ceph-0.81/src/test/Makefile.am	2014-07-04 06:37:26.156099589 -0400
-@@ -642,7 +642,7 @@
- ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
--ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
- endif
- 

ceph-0.81.0-configure.ac.patch

@@ -1,14 +0,0 @@
---- ceph-0.81/configure.ac.orig	2014-07-04 10:00:39.193099589 -0400
-+++ ceph-0.81/configure.ac	2014-07-04 10:03:54.739099589 -0400
-@@ -425,9 +425,9 @@
-         # the search path.
-         AS_IF([test "x$with_debug" = "xyes"], [
-         	dir='/usr/share/java'
--	        junit4_jar=`find $dir -name junit4.jar | head -n 1`
-+	        junit4_jar=`find $dir -name junit.jar | head -n 1`
- 		AS_IF([test -r "$junit4_jar"], [
--		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit4.jar
-+		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit.jar
- 		      AC_SUBST(EXTRA_CLASSPATH_JAR)
- 		      [have_junit4=1]], [
- 		      AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])

ceph-0.81.0-test-librbd-fsx.c.patch

@@ -1,11 +0,0 @@
---- ceph-0.81/src/test/librbd/fsx.c.orig	2014-07-04 07:23:03.485099589 -0400
-+++ ceph-0.81/src/test/librbd/fsx.c	2014-07-04 08:11:04.208099589 -0400
-@@ -1360,7 +1360,7 @@
- 	int ret, fd;
- 	struct rbd_ctx cur_ctx = RBD_CTX_INIT;
- 	struct stat file_info;
--	char *good_buf, *temp_buf;
-+	char *good_buf, *temp_buf = NULL;
- 
- 	clone_imagename(imagename, sizeof(imagename), clonenum);
- 	if ((ret = ops->open(imagename, &cur_ctx)) < 0) {

ceph-build-support-for-automake-1.12.patch

@@ -1,13 +0,0 @@
-diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
---- ceph-0.51/configure.ac	2012-08-26 01:58:14.000000000 +0300
-+++ ceph-0.51b/configure.ac	2012-09-24 09:19:20.791969694 +0300
-@@ -17,6 +17,9 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-+# fix automake problems in 1.12
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+
- # Automake
- AM_INIT_AUTOMAKE
- AM_PROG_CC_C_O

ceph-fix-sbin-target.patch

@@ -1,31 +0,0 @@
-From 69baa8948f2d922554e815c572d8339a4a197306 Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ken.dreyer@inktank.com>
-Date: Tue, 7 Jan 2014 21:51:14 -0700
-Subject: [PATCH] Fedora only: fix sbin path
-
-On Fedora, /sbin is a symbolic link to /usr/sbin. Install all the sbin
-binaries into the /usr/sbin location.
-
-Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
----
- src/Makefile-env.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 9bc6ee7..d02f034 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -26,8 +26,8 @@ bin_DEBUGPROGRAMS =
- # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
- ceph_sbindir = $(sbindir)
- 
--# certain things go straight into /sbin, though!
--su_sbindir = /sbin
-+# On Fedora these things also go into /usr/sbin
-+su_sbindir = $(sbindir)
- 
- # C/C++ tests to build will be appended to this
- check_PROGRAMS =
--- 
-1.8.3.1
-

ceph-init-fix.patch

@@ -1,18 +0,0 @@
-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
--# 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

sources

@@ -1 +1,3 @@
-5020b63746ccbaa454aab09450ee7a43  ceph-0.81.tar.bz2
+e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
+566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
+a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz