Revision bump to pull in backported bugfix for memory leak in FUSE client.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1A5D023975B0583D!

4 files changed, 250 insertions, 12 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 321a5e05cda3..302fb7b97fbf 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.55 2014/06/16 17:20:45 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.56 2014/06/25 09:54:31 dev-zero Exp $
+
+*glusterfs-3.4.4-r1 (25 Jun 2014)
+
+  25 Jun 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch,
+  +glusterfs-3.4.4-r1.ebuild:
+  Revision bump to pull in backported bugfix for memory leak in FUSE client.
 
 *glusterfs-3.4.4 (16 Jun 2014)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 3b368a7a184a..9cf8b7c9ce13 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
 AUX glusterd-r1.initd 451 SHA256 de39e1118fa1bfcc517f711e819ec78e67c58270383372a17886ca7362a7064b SHA512 90ba1109d393df99d7cc3092862684fd9d9a84b8ff8d7c7b5c7bfdabacee6ee209aa13e7c8d6b9497967aa5b5c30e984adf231b394dfbebb5d4d1f15b9f70f28 WHIRLPOOL 630596cba4af48fcdfb94bedf7f6a609dce85ac8dda835b699fd2ad0c3af64bd0b014c6fb97fe9d6faff8fc9a9652a2636e85372384027ac013abedeb71287c1
@@ -14,6 +11,7 @@ AUX glusterfs-3.3.0-silent_rules.patch 611 SHA256 6795dce0036131827fb10da67912bc
 AUX glusterfs-3.4.0-build-shared-only.patch 22147 SHA256 d11a171ffbc7b8a1fbcac5c651b2ad889a80b80bb2104787d6fd4bf56a2c2379 SHA512 a7b9a21717dff9f884674ea8b2b35e55f15c80a3ef4489a3ee2599c3f6d00534acedd6cbe09005d01d80a1fd0fc2e123745daa5bc7ca4d2166faed4a2b9822fa WHIRLPOOL 2a080cdbacac269b88109df6f3cb45a33bcddd0dfaf65a09160e8e17a9ef78e760f80b6acb3f9166ae7d4494820ec6562b3be8527510f93638556e21e7ce27c1
 AUX glusterfs-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch 1570 SHA256 feb911c892a594ecf75528fa5db90882225e1461d922a82ef0cc6b59d861e38a SHA512 ce50b1eeee82d2c1b46198be5729576a4b3d808618529dd72db31259a03993c1e2636cb52575c3f7c0276170f5292b1a62edb2d6960c28246ea52b9362a6de93 WHIRLPOOL 2a1c853c66fa6e2e799780347bcd863e4981dd835ab10cfd74e7673484860f37bff22bf51a878313293f1e6cb6d074888b665211e8e00c6242a7a0d051e54347
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
+AUX glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch 3120 SHA256 1f275bcd574a9f4b7d0d7f63976f4600b27ebd0f5825aa021d5369909cedae37 SHA512 c4608299a3d1df7e894a06b4c9de7b2c8fad222b8521293e05339e6ed222d5896f26d1f23e5f24c85205b86fb789c914719dd09370f3c58a28b5b0a4b2d6068f WHIRLPOOL c7d94cf52025851647aaa07338aacb1b7f495195da2b3521fd429adc069836a44d5666b87e69bd7204f09b2d2ab0418709e033eb3a5bc91f38fe415df14e6afe
 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
 AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2
 AUX glusterfs.confd 129 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 WHIRLPOOL 114f076456845087bf4dc28fb179cfea335f5f03b1d16098d836b5b0487c46fba4ee48d0bfab8cff7b2326b9585b327271d5c1d402db8289cafdf29f70ac063d
@@ -31,13 +29,7 @@ EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c
 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
 EBUILD glusterfs-3.4.2-r1.ebuild 4638 SHA256 b2bcb8fccaeec4497e530b7f35b5fd0d8a4c11a03db79ff8150d1ea42073d5b1 SHA512 adbbc2696670439d031273a0d5fde1882585a0361d73e78826d1adb4cf44dd9256361fe5e9f626655a0365c4d2c49d9725b869cfa7170507c17eab60049cb632 WHIRLPOOL a1bdf5ac317dde52303ba5d806bf9c5ed1207102f478f9ce2c87f28b1c802e680e0068dd2e059573cdb619746e9968257fd6dcf7400bf759253d5aaf974bdeec
+EBUILD glusterfs-3.4.4-r1.ebuild 4667 SHA256 b0f8fe093a6e859e57df157949f19c0cd318df8be9f2d98f668b96882d0e6b1c SHA512 1f0b014e4f806afb73e6f574207198e2f2aa018af5ef1c3b9baff75e13d0c66f9e64332b1caa52274adb9b8e4f21ede2cdaddac6e6c57a5fa72dcbb64d923d6f WHIRLPOOL 1fb1c0d5daecd97c4f2ec04577fe9feaa93184f09bc29cf756854f328b55e7cac9d4ba30d07a21fd56684930851b059c66950a2ab0e5b2f1dd78ddf2b71bdb1a
 EBUILD glusterfs-3.4.4.ebuild 4593 SHA256 d396bad164bad9e0a7379cec9134107aaf6ff7ee92350c9877b243c78b0a748b SHA512 a6c9dbc24bd98f9cdcd7db6cd1dc55793a9ed6c0400f459a6726b697298c28860d30461498ebcd1c0ca47601f1ce02d82a8ae7d00398b9dcf090d8618fb7cbe4 WHIRLPOOL 4c47c87d7094e99e9d5977b47a200defc3a592c9a734d2b39e240106fdbda7a68c6db0bb183505411a51559c91a7757d3689f0fcd2610602919b8b60a1706a29
-MISC ChangeLog 11113 SHA256 99ada1850da686a4705162764aef3f4f05df9b47b31c924de720e73c654bd604 SHA512 53846371f333ff56866ed4b4efe3e08f2b7d94a80108fe6d02ddcdda0e707b6a2cd3d92fe89a07ca3b5d84413dd2e371bb68f702e6664282417bba4388549088 WHIRLPOOL 4fb93787fd8a4749000a290ab0dbcf929d9d94f0ace4b741fa973b11273033b0e4f7dff1cb7093d1c6bef208327729b68e3885fdf492e3fe6ed29e9daef1aa9f
+MISC ChangeLog 11379 SHA256 afda85279290a4396bd28be53a59536cfdc7eee9b58ecd30a764de535d3eae1e SHA512 d762fb186d1f38566b983cb5f322c87d30ef32ab749e9a0dc9d9a6c26275a484099fe19b0d512756984fbdfa006e71063ef8588df3abca08a598c86c05418e68 WHIRLPOOL 660acb1ea8dbf58861e94ecff1ae694d297b7b7b23fee2f7490f963b654f4f4692173cedd2f63dc6e94fd93aeb17e5db93aa0b7a4b9e27807617e10a0c2b4741
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlOfJ3QACgkQKiQSS7ZY+hOXqQD+Lbs5AcdP1dtBlj54v8Xvn39e
-NUe45XEYSWdGxPH81p8A/Rnsjl87ENN2PoDt1B00J5jklZincoCw/DryHOiXMHd2
-=jzib
------END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch
new file mode 100644
index 000000000000..316e079322ca
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch
@@ -0,0 +1,91 @@
+From 0cf6f0727482b5b8816b5e58cb67ef124eae808e Mon Sep 17 00:00:00 2001
+From: Justin Clift <justin@gluster.org>
+Date: Tue, 24 Jun 2014 20:57:02 +0100
+Subject: [PATCH] fuse: fix memory leak in fuse_getxattr()
+
+The fuse_getxattr() function was not freeing fuse_state_t resulting in a
+memory leak. As a result, when continuous writes (run dd command in a loop)
+were done from a FUSE mount point, the OOM killer killed the client
+process (glusterfs).
+
+Manual backport of: http://review.gluster.org/#/c/5392/, provided
+by Martin Svec <martin.svec@zoner.cz>.
+
+BUG: 1112844
+Change-Id: Ic723675c53384d48c79ad1b11b21c1b17fb56866
+---
+ xlators/mount/fuse/src/fuse-bridge.c | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
+index e531970..da5937b 100644
+--- a/xlators/mount/fuse/src/fuse-bridge.c
++++ b/xlators/mount/fuse/src/fuse-bridge.c
+@@ -3207,6 +3207,7 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)
+         fuse_state_t *state = NULL;
+         struct fuse_private *priv = NULL;
+         int rv = 0;
++        int op_errno = EINVAL;
+         char *newkey = NULL;
+ 
+         priv = this->private;
+@@ -3227,26 +3228,23 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)
+                         "%"PRIu64": GETXATTR %s/%"PRIu64" (%s):"
+                         "refusing positioned getxattr",
+                         finh->unique, state->loc.path, finh->nodeid, name);
+-                send_fuse_err (this, finh, EINVAL);
+-                FREE (finh);
+-                return;
++                op_errno = EINVAL;
++                goto err;
+         }
+ #endif
+ 
+         if (!priv->acl) {
+                 if ((strcmp (name, "system.posix_acl_access") == 0) ||
+                     (strcmp (name, "system.posix_acl_default") == 0)) {
+-                        send_fuse_err (this, finh, ENOTSUP);
+-                        GF_FREE (finh);
+-                        return;
++                        op_errno = ENOTSUP;
++                        goto err;
+                 }
+         }
+ 
+         if (!priv->selinux) {
+                 if (strncmp (name, "security.", 9) == 0) {
+-                        send_fuse_err (this, finh, ENODATA);
+-                        GF_FREE (finh);
+-                        return;
++                        op_errno = ENODATA;
++                        goto err;
+                 }
+         }
+ 
+@@ -3254,16 +3252,19 @@ fuse_getxattr (xlator_t *this, fuse_in_header_t *finh, void *msg)
+ 
+         rv = fuse_flip_xattr_ns (priv, name, &newkey);
+         if (rv) {
+-                send_fuse_err (this, finh, ENOMEM);
+-                free_fuse_state (state);
+-                goto out;
++                op_errno = ENOMEM;
++                goto err;
+         }
+ 
+         state->size = fgxi->size;
+         state->name = newkey;
+ 
+         fuse_resolve_and_resume (state, fuse_getxattr_resume);
+- out:
++
++        return;
++ err:
++        send_fuse_err (this, finh, op_errno);
++        free_fuse_state (state);
+         return;
+ }
+ 
+-- 
+1.9.2
+
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..edea95e962e1
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.4-r1.ebuild,v 1.1 2014/06/25 09:54:31 dev-zero Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
+	systemtap? ( dev-util/systemtap )
+	sys-libs/readline
+	dev-libs/libaio
+	dev-libs/libxml2
+	dev-libs/openssl
+	|| ( sys-libs/glibc sys-libs/argp-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
+	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
+	"${FILESDIR}/${PN}-3.4.4-fuse-fix-memory-leak-in-fuse_getxattr.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	 use georeplication && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--disable-fusermount
+		$(use_enable debug)
+		$(use_enable bd-xlator )
+		$(use_enable fuse fuse-client)
+		$(use_enable georeplication)
+		$(use_enable infiniband ibverbs)
+		$(use_enable static-libs static)
+		$(use_enable systemtap)
+		--docdir=/usr/share/doc/${PF}
+		--localstatedir=/var
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	if use extras ; then
+		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
+		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
+			newbin extras/${e}.sh ${PN}-${e}
+		done
+		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	# QA
+	rm -rf "${ED}/var/run/"
+
+	use georeplication && python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	elog
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	elog
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	elog
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+
+	elog
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}