backport cpp patch from upstream, fix bug 556406, 555270

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

5 files changed, 214 insertions, 19 deletions

diff --git a/sys-cluster/ceph/ChangeLog b/sys-cluster/ceph/ChangeLog
index cec0b00969d3..f3502855f80a 100644
--- a/sys-cluster/ceph/ChangeLog
+++ b/sys-cluster/ceph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/ceph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.74 2015/07/15 08:57:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ChangeLog,v 1.75 2015/08/04 15:47:03 dlan Exp $
+
+*ceph-0.80.10-r1 (04 Aug 2015)
+
+  04 Aug 2015; Yixun Lan <dlan@gentoo.org> +ceph-0.80.10-r1.ebuild,
+  ceph-0.87.2.ebuild, +files/ceph-0.80.10-cpp-backport.patch:
+  backport cpp patch from upstream, fix bug 556406, 555270
 
 *ceph-0.94.2 (15 Jul 2015)
 *ceph-0.87.2 (15 Jul 2015)
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index b87b27bb1db1..7aba07cf74f7 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX README.gentoo 693 SHA256 fa99434d4b1141086cb6c8ec20251e0fc259e6a7f8c20f0a3b93eeff750ec888 SHA512 79eefaebf0d5a0f5e36a2cb0fb1c2433c9498f4bfa99222a124c349078f47583687dff0eede2d6e64af38431b90d519dc78d4142cbad1aa7699d00ab1c3a65b6 WHIRLPOOL d16e9219a964ccfe94dd4cd950420c6405386f249ee7156569e8d79aff749606c9835e04634a39a5cbed0c72d81617d0c28410c15717af59c4c43a00572acda3
 AUX ceph-0.79-libzfs.patch 446 SHA256 bab2247437de8fa0254a97d2224ee1dba2b43393984431910ff6513795a03598 SHA512 24e3da2e47a2c4fc0eb3a9b1d7e1c9da124b138ee1f1141f50a4dacf441aa63cf8a2407edc3d8e008534800f7289c48bb9d5b0207ce2a84c335730afc6ef72da WHIRLPOOL 169a81e9b7e9dc68eab5af9b0eac9f77caee206477a944303d4428e4e20c1793a4aff161a4d312981d496079dd2aa06c9acd1366a0c57c1040b13afc59396f53
+AUX ceph-0.80.10-cpp-backport.patch 1694 SHA256 5a8cd3f06f3949c6f81863db84f3e16dd3455ac04cabab06ba2611973e8c8c7d SHA512 1008d9b3f4e3a10903d9da97983ca067ae63eec022991fefbab99a4af287f183d40a44ad44be386f6627170b97661378d2e68e3a2fb0f526f008441e909ad220 WHIRLPOOL d5341a45ebd613d747f73da5c66baa2154b4df0d5aa4fdc90f99a2b5599f6bb9868845782fabe3049c25b622c829d45d18a38a3d517e9dff148014f4fda3d5e1
 AUX ceph-0.87.1-glibc-2.20.patch 1717 SHA256 866ca86d70907eda7155d840a24e72ba5ddf6fa807bf939e3e653ed4593d238a SHA512 d4da93e7e1ae3a761555753b4ed4cd880b68b72c0f00fc7aeb8c9c8a614a462e04502677dd46a91c4487ad6c731152bdcbf815023edf9dfd14a4d09588e7c979 WHIRLPOOL 27fa01d969aa5540e0b88c3bd6e7ff63f968060b2830c3ea6f746024b8fe8269f76aec8bce04dc44c7e1e50b6c656641cbf7ae6cb75f639f6157464705fae7f3
 AUX ceph-fix-gnustack.patch 867 SHA256 6a92074666a849de2177b4d3a68b01028f8d61dcac598a22eb0a8937cf297ea1 SHA512 bbea19531662d500c483d71d32dfb911dc62b027e1c5de3faf4c705c4c07274f00ccdcff14fcac75d2e8a2190bef82d307eeb1fe49f919a8e570f4afbfe71f6b WHIRLPOOL 6c40204c606e06cc39fe25575f620029b6d4b81eaa9c74d539d13b66ccf1a07913e56cb4c3ea60cd527d671a61371b99c2d97bee09edc6fcf25b64a22adc9bcc
 AUX ceph.confd-r1 69 SHA256 68d0b46b925fbc0e1571230c8bcc55f46beab4e575a3d964a3753534d751fe31 SHA512 b7f7ebb48b94398eaabb6df2cf3a5697d9a055ea4dd9b73c40d2bbf0e1445f418ed760b1f4ebb13cbb7315b2583847eb97b8649f67b6b7cf98081c0599c86aaa WHIRLPOOL 0e1989d813e7e8234112f656a4e017fae521aa5f09d344ddd1f685a6afbe3afdd51adcaf979a8395ab85ae30e6526a03d8c838d10e46f674eec7651d2df43abe
@@ -12,29 +13,30 @@ DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e24
 DIST ceph-0.80.9.tar.bz2 4061267 SHA256 59fa4a60f96e648b023e05690ef4d0042cbdacf4d2f50880162ff484bfbb7797 SHA512 b2f62510c6615bcb884c201852ae11abc94faf5b51899c4e326aab4c5e1ef2c7bca8002e1c46c41fd9e82ea16f570c4ee33ee9ff0c5e7c6dfb6a2bc8da15db95 WHIRLPOOL ddbcf45b781466525b6d577ab155ea32094388aabb98e03b7186ecd90d743cbb05fbedcf212df5f5a78eddf4458bfba92f6c8220c61f8ddb89a2f4b8ce7f87f1
 DIST ceph-0.87.2.tar.bz2 5839901 SHA256 094a741a93958799854837eb5e576aa7ed0513029b57d6318c8353448784818f SHA512 71a234d741bef1f89e725871fdefec2c43d2296058f1aa3ec01e7544d6987975ec8db0712c8d8123b9af5a1bff3ab99350961a578b6716bf80ef6d22dfa6863b WHIRLPOOL faac7d27a3d3e5fdce431b3fc2d64eedf11246620a554175f0bcbff77706bf3255a1d82ca6c3f254ade22a5b525ca7c2d64c27ef86d65181a17999a9b4a4dc60
 DIST ceph-0.94.2.tar.bz2 7041327 SHA256 2cf36977e17d5782cdcfc885dcc2226c9c6e1454c1650f53a1e38a73e96544e8 SHA512 10b7ad611ff72b9367996e297f12dbef44c0d896ccf20133405b1d244dd1f9c9e813642918c01c16936aad58315912a87ca8dc2dcf3071311cfb14bde7e62790 WHIRLPOOL 207c8909927d520403554cc02880f8ed340602c98b2cfd4d9078afa76b79a83c5e070237f821f785eb2779cd63b3f015b85f08b031e48a7b1a862f1194947fb9
+EBUILD ceph-0.80.10-r1.ebuild 2928 SHA256 26c3a7a4c7a022384bb5916e8f0b6855e9afbfcf8282a6e94955e89e65978a79 SHA512 446ec396f636f929d45039eefa86077f6b2d15bca0eb26f8e3edd20b0cd6fea5aa09eeec7eb6aabc57001e3e52084bffb056f4e0012ad3aec50fc23d603bca6a WHIRLPOOL 908fee069b861313348d97132bf9a8e01944395e4d4af435d345525cfb06df8ea07d1d23790f5108d4286cc3e61e788ca2d1b43a5a75d81702ef01d57f534c92
 EBUILD ceph-0.80.10.ebuild 2886 SHA256 f43fbba970ae65d29cfbe1958983cfd34ef91179e8b16d2914baed4dabebb8d3 SHA512 4c79e1028f2dfd879176d59d5857378da0165b3201fd72c7ada4657a44561a0e2740ca07b76ba9f67537946c1006c2aa494dea13a61103ce2d30603a0555a4b6 WHIRLPOOL 8cd73d1436dbe60e46699886d936ecc40fd7c18e5d069aa4c2751280bdb15e04c24b4aefc0a79c76938ae8f412031411ce2687017935d096b4404ab0b206545f
 EBUILD ceph-0.80.9.ebuild 2882 SHA256 190712a1024d21de977a0a0a3c3a95cc9909ab88b90a8cb4861e029813c245a0 SHA512 36e708a30413471de5f85ad8bc4b47de340e02e313c83bba6852468ad4c3e0f4613daea0222bac31685eca3a6181dc909272b0fc5b892f3d82d40e1b06665520 WHIRLPOOL b68cdd8cd36904526d1fe8f0fef4a0499e66f9b5d5d8447c0a814df0596204ed6ad4a8c4406c5f27f758530afbe764d1b3f56f3e8c84a3b9fb99517e11661a26
-EBUILD ceph-0.87.2.ebuild 3197 SHA256 ca79b1f0582747b72cd391016f876ca8adc1f48a298e46fb479d60b16b142904 SHA512 ab308db43c8002a2f005baba0e2bf4275805128cc92faa513b12adf7cc443e09ed5b8f73df61d7f58bee7a291289007fff74a4579e2570b0b5f05a3d29da9511 WHIRLPOOL ec7f3d0e1af7770bb8047bd78a5a85cbae975be8f78e8453655a70644bdfd6da2f64118b7f3dc928019d2ed368cda4891dd7f53a422775d10905ab06d2fcce72
+EBUILD ceph-0.87.2.ebuild 3152 SHA256 b3cec021d612a4f99a7f43b3609ccadecdf921b0c09dd23ce524606e8d12d9b1 SHA512 42bbfec5f330d58998a02c766b638938175f228c6a7cb88204b09c8462d24c8ee64d26587de774545bc9ea75751bcaea5582d4d01ffa741c7a4aa158c5d0a13c WHIRLPOOL 2864bebc807c1762606984c1e63f916f6a0f776eb7d68d931c2a8075cadc525c478a20f79a4496c446f2b674cfd66ca051d2b1b599b6f830dfc10bdc89290bd4
 EBUILD ceph-0.94.2.ebuild 3062 SHA256 2ea07688b14e3809c5b3622c050fe23013526d4f21bd6f11a002277feb943dc8 SHA512 bf4d3e727c12061efe7801cbabb64e67508887b88b02bd81e1fd3cf1a8e70e1d30c05892ab5dfdd23531d3fc9e22eb73aa66ffdafc91e1f91826b2323a3d9668 WHIRLPOOL 4079035b12bbb131a0db30d178e21c2dbf6c45d260265bb728f839685f06cb17815ac5e2b74c7c793dee469de8bb048dc41da9c4a5cb89c957dbba0475b7762c
 EBUILD ceph-9999.ebuild 2845 SHA256 f762d2a9d5c344fbd1c826e344dfe6270ce92575f5bd44448c4a85b8f0e0a818 SHA512 9b76628cf387d46af61d32287da233b31a51a30ca120cdb21695daa29ebff52383f3005a7945ea873aae711c047da23f72eee663456736ae5b20eff477cbb974 WHIRLPOOL 4673110344139470ab4443069527bff6e6e007bb49a850dee8eddc38acad28ba45d9da481631f80c0e2c2959793c57f50e8f1fd721f5834560a7794f4bd55740
-MISC ChangeLog 13716 SHA256 d4463f747553918213e14efa75f06d2e9d0b7e4c9f7057f4f46b7d06e7645e11 SHA512 7a2203178b9ff129b113720d19dabef591e465f7076d5cec2870b90bc427042ad7aac940c03a2ae61056275c4d2c6253596b428256c04e28eb8957302a962810 WHIRLPOOL 331347c2a737fe66c80023b2c1fccf055d4bb7cbc4cd628fac334712fff83eed204ba33d5c65cf4742ffc5d97628c1c087a207c02483aa26c938a756139de6d7
+MISC ChangeLog 13938 SHA256 6f0a37265aa187b446d279dfbdd3f8cc8951dbbbf9077688be163d84ffbe0820 SHA512 9a2d4fd667b48ffc88144eebd201ecfad307b22694bdad6664f3c0b1900de605d79d2274ced6533f45ca85b44a18691205141b2c60fbf010d59c3da65c2426c8 WHIRLPOOL f36bbe6be8e47ccb41bc53e019907c4673682d3d667c0ce0ffb9aef3bb3903c9c555888bf6f54a46bda9551ba6d2885ac565176ddd6edfe920c9fc06f5d70048
 MISC metadata.xml 1062 SHA256 0dbed50fc9e802118dc3aa1b8b54550d3861f60a0d2d93c67736d39da4aa163c SHA512 4d669abb6885ec1585902710450f3657ad5ca48cb385671fa83c45b74f7ec2d1a265791a749389d3fcce3232b058aa62be58beba7274811f30f0574db04bb184 WHIRLPOOL e76cf088e399d30af8f1d2416374ef21fa731139bb93e37fb618ed915f999213e28c8b5229b2219b0e1526d0767c2fc57a14ddfd939e5bab7ee16ea250fbebce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVppEpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVwU8PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
-MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtP9wP/jS6zLKCo71Gi4NSltL/YZPa
-3XCWWQfrDR0Tj+uYkAZPuPV3egRBBw19zFw3fqundZ0syjwPGcLovt1nF62b6tiE
-30NMJPzeOfa/AP3m6Vhc3DkJ16PlcDy8r1PrJRUZOtZDtoWMMIL9smAu15GPSCfp
-e8CNAhmUB8wvN5y1EWXM2c3VUxBWksYvmY8XJFjVCDE6/Hc+jBkffWzFwRRL1Wvu
-NK/MHv9fxno7CDeKEgDeApm1mPU1W2kFJJabXJeHEC0xTrho8h5WJWMEK0LFRtQq
-32qSVI7jkXwi2xjfoky2s3jRmlc2UtnoEZCedWNMzMbIcfhO2R4F3TK3T1wt9Fp1
-RvTTb/WkCOaDvHukulrW+O1jzt9rlHPEK21EEZMsbAUs3/t2Du4AXOLCghxYhVKf
-PCICO5CT+fXqiUiJD7chA6H0EOM136HcEO/m6SZPig+a0WWilmSHzwJb4LGVr9Lk
-qGGUBUYMA2MH+p3o1R3f3Vdjtfg7gEeSnBkom8qzVhaxGMIV5x8XWUdR4e/65Kv6
-kVKiUZpJt/2nITlH2xNaa1f2sURb/ebKSOvCPh8ts4f47ML6Nbbf9jnEsDi/Y7/3
-/P8veHfSEeGLr3aFucrHOkbJ1tnqXRDHgXwQHtspb2M2zKGMT47NmFQXGvnzFihx
-HG1vWh173QrjXbCSWPm5
-=dS9N
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvt6HMQAI1nUlGWLQkDd0bmUavWrLRk
+PR0gDrKMvfxZiavdDCir/NYjWb4I9Jix1eVfQ4ImRWSbjjIZ28W55Z65/hRVqw1G
+wQdgAbI+Om8mecK1Lmb0Y94TRsRIsTj9pareHHSLpw96lGsx+nf8Lv96PcoPzS5F
+YRajRKLols636hbtIjhouZtz6zO4E87so0wXDVzP55VG8XCT7fQ+hdFSgcDEN/t3
+FB+7qf1ssoGtdwv69apYOl6N9tQwF80HvwvLTC5ytACT4WNzbaWpmy9y1OkMobzZ
+eMq0kW8qtvzuF0SnU2EIl6x+jb8XOYVMNOb0GY0utY9c91ol8psHxq6wptHq1NMV
+XP6DWOw6mMWzO3ZBVPl3kol6epKRYXYDdsK/+TLTYAaakJrNAK+mmwGYJgFDcwbb
+5rpwzOBsuosQ1clf+Qtsx/ZHVv8Xwo12HtUH5Ne7ZdJK5OjrAAQkVz10w/jlJ6Iw
+kbUSU+u4O2dDMNRytWplr0R7Zb4wRbEWthfyjBc3yoxNG6lJGwbzq0P5ump0QYuD
+z6WWudgTJFEOuPqYqrV8zXeuBD6aqD9X9WYQlgwPFu02ULyOtDad1yTJtY3dHcFc
+FOgkdlP9sBLNZenJfMGijXa70hfLZ+vFnDNrgMcRdPLqqGP3WvObhm99uTXMtZ41
+LDqfU79G4CQMW5NsIJ45
+=KCTl
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ceph/ceph-0.80.10-r1.ebuild b/sys-cluster/ceph/ceph-0.80.10-r1.ebuild
new file mode 100644
index 000000000000..c6251a025f0d
--- /dev/null
+++ b/sys-cluster/ceph/ceph-0.80.10-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.80.10-r1.ebuild,v 1.1 2015/08/04 15:47:03 dlan Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI="
+		git://github.com/ceph/ceph.git
+		https://github.com/ceph/ceph.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cryptopp debug fuse gtk libatomic +libaio +nss radosgw static-libs tcmalloc xfs zfs"
+
+CDEPEND="
+	app-arch/snappy
+	<dev-libs/boost-1.56.0:=[threads]
+	dev-libs/fcgi
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/leveldb[snappy]
+	nss? ( dev-libs/nss )
+	cryptopp? ( dev-libs/crypto++ )
+	sys-apps/keyutils
+	sys-apps/util-linux
+	dev-libs/libxml2
+	fuse? ( sys-fs/fuse )
+	libatomic? ( dev-libs/libatomic_ops )
+	xfs? ( sys-fs/xfsprogs )
+	zfs? ( sys-fs/zfs )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		gnome-base/librsvg
+	)
+	radosgw? (
+		dev-libs/fcgi
+		dev-libs/expat
+		net-misc/curl
+	)
+	tcmalloc? ( dev-util/google-perftools )
+	$(python_gen_any_dep '
+	' )
+	${PYTHON_DEPS}
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	sys-apps/hdparm
+	$(python_gen_any_dep '
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	' )"
+REQUIRED_USE="
+	^^ ( nss cryptopp )
+	"
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.79-libzfs.patch
+	"${FILESDIR}"/${P}-cpp-backport.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-hadoop \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--includedir=/usr/include \
+		$(use_with debug) \
+		$(use_with fuse) \
+		$(use_with libaio) \
+		$(use_with libatomic libatomic-ops) \
+		$(use_with nss) \
+		$(use_with cryptopp) \
+		$(use_with radosgw) \
+		$(use_with gtk gtk2) \
+		$(use_enable static-libs static) \
+		$(use_with tcmalloc) \
+		$(use_with xfs libxfs) \
+		$(use_with zfs libzfs)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe src/init-ceph ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
+
+	keepdir /var/lib/${PN}
+	keepdir /var/lib/${PN}/tmp
+	keepdir /var/log/${PN}/stat
+
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+	python_fix_shebang \
+		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+	#install udev rules
+	udev_dorules udev/50-rbd.rules
+	udev_dorules udev/95-ceph-osd.rules
+
+	readme.gentoo_create_doc
+}
diff --git a/sys-cluster/ceph/ceph-0.87.2.ebuild b/sys-cluster/ceph/ceph-0.87.2.ebuild
index 96760442f2a7..17ad373b65b3 100644
--- a/sys-cluster/ceph/ceph-0.87.2.ebuild
+++ b/sys-cluster/ceph/ceph-0.87.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.87.2.ebuild,v 1.1 2015/07/15 08:57:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.87.2.ebuild,v 1.2 2015/08/04 15:47:03 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -74,7 +74,6 @@ REQUIRED_USE="
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.87.1-glibc-2.20.patch
 	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
 
diff --git a/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch b/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch
new file mode 100644
index 000000000000..ca79f0b6f483
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-0.80.10-cpp-backport.patch
@@ -0,0 +1,50 @@
+diff --git a/src/common/RWLock.h b/src/common/RWLock.h
+index 1a70ef1..2676ede 100644
+--- a/src/common/RWLock.h
++++ b/src/common/RWLock.h
+@@ -18,6 +18,7 @@
+ #define CEPH_RWLock_Posix__H
+ 
+ #include <pthread.h>
++#include "include/assert.h"
+ #include "lockdep.h"
+ #include "include/atomic.h"
+ 
+diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
+index 39e3429..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>
+ 
+@@ -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();