[Pkg-ceph-commits] [ceph] 08/12: Add upstream patches to fix compiling with boost 1.57
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Mon Oct 12 14:24:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch master
in repository ceph.
commit ad1248a20c41234dc6cacb14e6c994c335c4c121
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Tue Oct 6 17:16:17 2015 +0200
Add upstream patches to fix compiling with boost 1.57
---
debian/patches/boost-1.57_1.patch | 118 ++++++++++++++++++++++++++++++++++++++
debian/patches/boost-1.57_2.patch | 38 ++++++++++++
debian/patches/series | 2 +
3 files changed, 158 insertions(+)
diff --git a/debian/patches/boost-1.57_1.patch b/debian/patches/boost-1.57_1.patch
new file mode 100644
index 0000000..f2b9a7c
--- /dev/null
+++ b/debian/patches/boost-1.57_1.patch
@@ -0,0 +1,118 @@
+commit dd8c43b90e0243a6c994a80325c6203a8a4d07de
+Author: Petr Machata <pmachata at redhat.com>
+Date: Thu Jan 29 10:15:02 2015 -0700
+
+ support Boost 1.57.0
+
+ Sometime after 1.55, boost introduced a forward declaration of
+ operator<< in optional.hpp. In 1.55 and earlier, when << was used
+ without the _io having been included, what got dumped was an implicit
+ bool conversion.
+
+ http://tracker.ceph.com/issues/10688 Refs: #10688
+ Signed-off-by: Ken Dreyer <kdreyer at redhat.com>
+
+diff --git a/src/common/map_cacher.hpp b/src/common/map_cacher.hpp
+index da79e82..03adc65 100644
+--- a/src/common/map_cacher.hpp
++++ b/src/common/map_cacher.hpp
+@@ -16,7 +16,7 @@
+ #define MAPCACHER_H
+
+ #include <boost/scoped_ptr.hpp>
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include "include/memory.h"
+ #include <set>
+ #include <map>
+diff --git a/src/include/encoding.h b/src/include/encoding.h
+index 434d158..120809c 100644
+--- a/src/include/encoding.h
++++ b/src/include/encoding.h
+@@ -286,7 +286,7 @@ inline void decode(T &o, bufferlist& bl)
+ #include <deque>
+ #include <vector>
+ #include <string>
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+
+ #ifndef _BACKWARD_BACKWARD_WARNING_H
+ #define _BACKWARD_BACKWARD_WARNING_H // make gcc 4.3 shut up about hash_*
+diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
+index 5235d4d..64cd74f 100644
+--- a/src/osd/ECBackend.cc
++++ b/src/osd/ECBackend.cc
+@@ -13,7 +13,7 @@
+ */
+
+ #include <boost/variant.hpp>
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include <iostream>
+ #include <sstream>
+
+diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
+index 28bcf8a..1702bed 100644
+--- a/src/osd/ECBackend.h
++++ b/src/osd/ECBackend.h
+@@ -18,7 +18,7 @@
+ #include "OSD.h"
+ #include "PGBackend.h"
+ #include "osd_types.h"
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include "erasure-code/ErasureCodeInterface.h"
+ #include "ECTransaction.h"
+ #include "ECMsgTypes.h"
+diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
+index c25023c..b95cdf7 100644
+--- a/src/osd/ECTransaction.cc
++++ b/src/osd/ECTransaction.cc
+@@ -13,7 +13,7 @@
+ */
+
+ #include <boost/variant.hpp>
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include <iostream>
+ #include <vector>
+ #include <sstream>
+diff --git a/src/osd/ECTransaction.h b/src/osd/ECTransaction.h
+index 7b104c7..fc31cde 100644
+--- a/src/osd/ECTransaction.h
++++ b/src/osd/ECTransaction.h
+@@ -19,7 +19,7 @@
+ #include "PGBackend.h"
+ #include "osd_types.h"
+ #include "ECUtil.h"
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include "erasure-code/ErasureCodeInterface.h"
+
+ class ECTransaction : public PGBackend::PGTransaction {
+diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
+index c8e1c4b..44ef20b 100644
+--- a/src/osd/ReplicatedPG.h
++++ b/src/osd/ReplicatedPG.h
+@@ -17,7 +17,7 @@
+ #ifndef CEPH_REPLICATEDPG_H
+ #define CEPH_REPLICATEDPG_H
+
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+ #include <boost/tuple/tuple.hpp>
+
+ #include "include/assert.h"
+diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
+index 2ff1f8c..4ecae8c 100644
+--- a/src/osd/osd_types.h
++++ b/src/osd/osd_types.h
+@@ -22,7 +22,7 @@
+ #include <stdio.h>
+ #include <memory>
+ #include <boost/scoped_ptr.hpp>
+-#include <boost/optional.hpp>
++#include <boost/optional/optional_io.hpp>
+
+ #include "include/rados/rados_types.hpp"
+
diff --git a/debian/patches/boost-1.57_2.patch b/debian/patches/boost-1.57_2.patch
new file mode 100644
index 0000000..156ed47
--- /dev/null
+++ b/debian/patches/boost-1.57_2.patch
@@ -0,0 +1,38 @@
+commit fcac7ab6305dc3215fdcb46951fa9ee4cbf68ce3
+Author: William A. Kennington III <william at wkennington.com>
+Date: Sat Sep 20 22:52:31 2014 -0700
+
+ osd: Cleanup boost optionals
+
+ Signed-off-by: William A. Kennington III <william at wkennington.com>
+ (cherry picked from commit a53ead14c113047567177630b4906136a2109b65)
+
+diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
+index 39e3429..5235d4d 100644
+--- a/src/osd/ECBackend.cc
++++ b/src/osd/ECBackend.cc
+@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
+ lhs << "read_result_t(r=" << rhs.r
+ << ", errors=" << rhs.errors;
+ if (rhs.attrs) {
+- lhs << ", attrs=" << rhs.attrs;
++ lhs << ", attrs=" << rhs.attrs.get();
+ } else {
+ lhs << ", noattrs";
+ }
+diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
+index c8fb01e..b04f8f4 100644
+--- a/src/osd/ReplicatedPG.cc
++++ b/src/osd/ReplicatedPG.cc
+@@ -5065,7 +5065,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
+ for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
+ p != ctx->notify_acks.end();
+ ++p) {
+- dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
++ if (p->watch_cookie)
++ dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
++ else
++ dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
+ for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
+ ctx->obc->watchers.begin();
+ i != ctx->obc->watchers.end();
diff --git a/debian/patches/series b/debian/patches/series
index 866283c..d6dc7ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,8 @@ rbdmap1-mount.patch
rbdmap2-hooks.patch
bug-11860.patch
CVE-2015-5245.patch
+boost-1.57_1.patch
+boost-1.57_2.patch
boost-1.58.patch
## Debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list