From 222abd2152541e4f0f9b1744b7eda88630cde803 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 31 Jul 2015 14:56:49 +0100
Subject: [PATCH] Fix build against boost 1.58
 (http://tracker.ceph.com/issues/11576).

---
 0001-mon-remove-unused-variable.patch | 30 +++++++++++++++++++++++++++
 ceph.spec                             |  9 +++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 0001-mon-remove-unused-variable.patch

diff --git a/0001-mon-remove-unused-variable.patch b/0001-mon-remove-unused-variable.patch
new file mode 100644
index 0000000..17ee63f
--- /dev/null
+++ b/0001-mon-remove-unused-variable.patch
@@ -0,0 +1,30 @@
+From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@redhat.com>
+Date: Fri, 8 May 2015 15:21:20 +0800
+Subject: [PATCH] mon: remove unused variable
+
+* as a side effect, this change silences
+  http://tracker.ceph.com/issues/11576
+
+Fixes: #11576
+Signed-off-by: Kefu Chai <kchai@redhat.com>
+---
+ src/mon/OSDMonitor.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
+index 73dcd5f..7caaa45 100644
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
+   } else if (prefix == "osd crush get-tunable") {
+     string tunable;
+     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
+-    int value;
+-    cmd_getval(g_ceph_context, cmdmap, "value", value);
+     ostringstream rss;
+     if (f)
+       f->open_object_section("tunable");
+-- 
+2.5.0
+
diff --git a/ceph.spec b/ceph.spec
index bb5c780..a526652 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -12,7 +12,7 @@
 #################################################################################
 Name:		ceph
 Version:	0.94.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
 License:	GPLv2
@@ -27,6 +27,9 @@ Patch3:		0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
 # fix build without tcmalloc
 # https://github.com/ceph/rocksdb/pull/5
 Patch10:	ceph-0.94.1-tcmalloc.patch
+# Fixes builds against boost 1.58.
+# Upstream commit e7b196a4a091c0ea258866559ba06e7ed0cc4247
+Patch11:        0001-mon-remove-unused-variable.patch
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -432,6 +435,7 @@ python-cephfs instead.
 %patch1 -p1
 %patch3 -p1
 %patch10 -p1 -b .tcmalloc
+%patch11 -p1 -b .boost
 
 %build
 # Find jni.h
@@ -934,6 +938,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 # actually build this meta package.
 
 %changelog
+* Fri Jul 31 2015 Richard W.M. Jones <rjones@redhat.com> - 1:0.94.2-4
+- Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).
+
 * Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159