Fix use_enable that prevented installation of mount.glusterfs unless georeplication was set. Drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

8 files changed, 29 insertions, 449 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 03dda1868f68..71c8f8b97317 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,17 @@
 # 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.53 2014/02/14 14:06:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.54 2014/02/24 13:10:08 xarthisius Exp $
+
+*glusterfs-3.4.2-r1 (24 Feb 2014)
+
+  24 Feb 2014; Kacper Kowalik <xarthisius@gentoo.org>
+  +glusterfs-3.4.2-r1.ebuild,
+  -files/glusterfs-3.4.0-gfapi-handle-failures-in-graph-switches.patch,
+  -files/glusterfs-3.4.0-glusterfsd-Use-dynamic-volfile-buffer.patch,
+  -files/glusterfs-3.4.0-parallel-build.patch, -glusterfs-3.4.0-r1.ebuild,
+  -glusterfs-3.4.1.ebuild, -glusterfs-3.4.2.ebuild:
+  Fix use_enable that prevented installation of mount.glusterfs unless
+  georeplication was set. Drop old
 
   14 Feb 2014; Ultrabug <ultrabug@gentoo.org> glusterfs-3.4.0-r1.ebuild,
   glusterfs-3.4.1.ebuild, glusterfs-3.4.2.ebuild, +files/glusterfs.logrotate:
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 10793a9d7be3..c0ce69b9302e 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,10 +12,7 @@ AUX glusterfs-3.3.0-docdir.patch 756 SHA256 f1af7734b9b886a6de89dbc86deea4917ad8
 AUX glusterfs-3.3.0-parallel-build.patch 618 SHA256 822f6c339541f7a10e01efcbb04214d4628a08e766e742d5891fb28975624e5e SHA512 697e5aca20f47813e7c6fa237e150eec0937135207e710edf1fda3ab3b90b8c116a32f970f22816074928ddcd1040977576e015cce9b42767c54abd8b75fade1 WHIRLPOOL 343ed65732137bca28ff1ed22825dcc617f298fbb2506cae79de3695534ea9ffce6e9880316f5d09ef33d13e42c6a298849ca49ddccf7060cca298e71a5311d1
 AUX glusterfs-3.3.0-silent_rules.patch 611 SHA256 6795dce0036131827fb10da67912bc5d6a675697d7d2bbc135790917b9917cf2 SHA512 057c4ffbf8c229a57ae652b93e4c92e7e2a222c4d9dbdd1b44b5da1a47eb3462960698cb3a27ed5f83dcf75e7e9ed515ece3e82a10a41da02bcb5af63d6df63c WHIRLPOOL a2cf7ea041aa0a0ee8d398c7d75ae68e144389301dc1c4a243c0e2c1db332223f48b775f432d5468b1464770fe12ef0362d3178f771d2b4346dc864865a99a29
 AUX glusterfs-3.4.0-build-shared-only.patch 22147 SHA256 d11a171ffbc7b8a1fbcac5c651b2ad889a80b80bb2104787d6fd4bf56a2c2379 SHA512 a7b9a21717dff9f884674ea8b2b35e55f15c80a3ef4489a3ee2599c3f6d00534acedd6cbe09005d01d80a1fd0fc2e123745daa5bc7ca4d2166faed4a2b9822fa WHIRLPOOL 2a080cdbacac269b88109df6f3cb45a33bcddd0dfaf65a09160e8e17a9ef78e760f80b6acb3f9166ae7d4494820ec6562b3be8527510f93638556e21e7ce27c1
-AUX glusterfs-3.4.0-gfapi-handle-failures-in-graph-switches.patch 1056 SHA256 47e3105efdebcdbed1ecfbd25cc7b296144b40ee1bc3cd9d67b9e86013d171b9 SHA512 8eab974945560c6fa19e47c35f4f88c5d981cdce4cee47e6e02a2ee6dd76d462fd405ba326fb4254eed27bb8d126616d5ee0f609b5f12f2ccc040575a92262ad WHIRLPOOL 65453d571db3f8a33371f667c63adf48c01608b7bd902b6f7acba745c1a1fe913f9586ad7fb3ef4b17174c7f2b8dbb1c3fe52ca84a1b4c276e614fdd99961d87
-AUX glusterfs-3.4.0-glusterfsd-Use-dynamic-volfile-buffer.patch 2861 SHA256 913ccc05906eba7433f261d3f34af77e9405d24d54d946c83cd8466a242ca4f0 SHA512 1a390befc63efac4c14d7fb0019ca088b888602ea0cfdf42134d80459e1f6680668add53d3d5e5ab1e0b7177e0c07e37e09b6855f66cd439eab446c05a39de94 WHIRLPOOL 9aa0070f4f37e93bece922f46f8cbbaf36e0f20a3ee436380ba11af087a8a809663840d65c8593a20a86e992611fe207bd3d12884e41396bef9d13512f316bcf
 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-parallel-build.patch 951 SHA256 d31f674c16f18ac609093eb68e3e58487fc287d0e613e67013a3817739482ade SHA512 f8ff51eaad6d858764c6c30e0e426d3a6d43b77b4eb674936aee9c43dc29a7dd4b6d80237d0bed3b4fab1478a6a5481ed8236f0ff61b910cbec7fc2073295a13 WHIRLPOOL e1238f4f2215e04e2fbc0ab12169b4c75791bae4d600337adb0d8984fab3f1e68e408630fe5339d524ce976790976b22f3b52898ae4cf832208f90e856a1ad0e
 AUX glusterfs-3.4.0-silent_rules.patch 553 SHA256 08a55b2f54050ad47dae1a953fc1f1410842556bf2464ab15e7df9019ab24de5 SHA512 67fe230a667084f30960d4ed79f58c7da93edde086ca8614cb3f7160901cb87da471cce932cfae470033c5dfc92b00ed69fd0e32238bc0e9af770e1946f511ce WHIRLPOOL e596ee4c6fae6cb7f843501b55e832791d612547f81d5e6adf4e96ea8cc4fc20fd71d5164f7fe42a74ed0b8e7036643cd5b684317f98bfd610b91dbe4c4c3684
 AUX glusterfs-docdir.patch 1644 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07 SHA512 df942eb947c5568f78757a4629389cb5fc5b436ebf4f9ae15c95fb09549b20f939b4bbf5fc478ced803230f31f15373fad73cfc810f79f737cd0f4d7de3321e3 WHIRLPOOL 5ec4e6b02d0bd83632339f3889a2673bff027a116953ecf282b24ea26cb295a9ddbb489ee76788549ebeae262ae3bc7e36b8047b4ddeda0edeca37bb6126e317
 AUX glusterfs-r1.initd 3187 SHA256 2feecfabc353f6210b5f39c3a93e8eb9fa0a62dca6aa32dd9bf6796220b8fb49 SHA512 3129c5201de92d596a8ecd182b411d77093318c7a2a0b064a0111c0498cfb61d821a2922f9075cb991c965027a0494ef2bf49285e07bd816c2f28b8a5775bfc6 WHIRLPOOL 782ac2629a870ba835378e27e0af5195b9bb19da76ef3fc2a99d4140022c7697f36a03c13b0fc8c389367bd92cad377a80307ae982d7d8d1f2ecc6a0533009a2
@@ -27,22 +24,28 @@ DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec
 DIST glusterfs-3.2.7.tar.gz 2424292 SHA256 464c089ff9da5a8e17f7caeae48f1cad59973489dfe940a9f0d8db8bc14cd6c4 SHA512 c4a286e1ddfec6c92d011b5abe4f96321e39dff57294141fc44cda4578fa11582095362733092af9042b38528cb328208e9e46a33c40c70e672ffb4e38dcc013 WHIRLPOOL 843a615b334e1ee84c3bcef1a8aceb113eb6976656ae09c6cbf4dcb201f4d37d9cc8ef3ccd3cc4aeb879bffde556b9f6f7105c3c39afed94a19b9613cd8c4284
 DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a18338ff0b32922b12fd453da6104f17 SHA512 d450c91e6326a89c39e5c7a17b0e7493318a642fbccf8c729a841adcc422388a300b8fd852f9f978098dc87d956a697b681be5287502b5dc0ab29c71e6b8b9c7 WHIRLPOOL 4836a6aa17de011d2fa94121934972e6d15e434f392f713edc2b9b1e7ef8648a31f209c9dc85fc7a5e0ae0f1e902797ae49726304390b7d14596103958ea58d9
 DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
-DIST glusterfs-3.4.0.tar.gz 3774842 SHA256 2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8 SHA512 5eb08225c0dde5d2e7ea3de1531fdc155249647a0ffe8a472825cc5ca54762462811903e164dfb12f825dd569f7c1786275f843acf04f0668c0e6e7615a47381 WHIRLPOOL 05b194c94ede704631a7c8071b8857c38b01700c3b3cbfeb06708c026b8b18913cd233bee8508c04116ed0f9a15c919aec604927e9cd77566c6c633118347a25
-DIST glusterfs-3.4.1.tar.gz 3811931 SHA256 b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739 SHA512 94662dfef5e3060539d39adbde351489cb2b05bdfa76a54d9bbb628ddc897446b07175d8e22b126141833b4801d0357c897aa259803f2bc1921111f6b374ecc2 WHIRLPOOL 73ac2146be973d92304ec345ae63b746003f05803fc0ceeb03b4983f71034c329d35f9c023a6e8ab7cfe948f6d003ac93b59fdee7520686c3857eeef4d5f023b
 DIST glusterfs-3.4.2.tar.gz 3856046 SHA256 4fcd42b13b60a67587de98e60ff679803433bbb0c11aa2b40c4135e2358cedef SHA512 5d207e2d9437dacc5c53a205684419fb627c70870f7d2c4851b5a48f705886a04180a90a456bf6d7789b2a62fb6039c80a632d08629224b9594565b453085f50 WHIRLPOOL 8af9e92880b8c378d7329225666ef3347ba5a5510f3a6a513e340dd3b897339ab0817b93e50b20bd04c1b9438b3c5337b750737a2f51f1c76a727c110809b488
 EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d0454204e401444a357fb4371d90c9be3 SHA512 ba02e24cc76ab53059ec76ce9f84aafdd2e1ea47ba9e34390f4f73bfc170a4037e65795af3d17315c19d5cb50f1e784d095cf2129d8debc102fb2305c1637def WHIRLPOOL f0f4285e4c3dbf0704c2e3770891f5997dd4468ff8b9e944f3a14e0e607744382451edd9afc05b6d485efef69d54a48b8ae20b3efb7103b6dee8ecf33a3d2122
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
 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.0-r1.ebuild 4812 SHA256 07f79e9b2ab8b69ac05d7f7b1ba3ef16cb5b4d810e82f61d473212f3141f8949 SHA512 5b73d76ec01aff86fd93ac273fa6bee44b6e4ae0c9536b536d7677ab69c8342e7bc305b55bc8bdaa5f33707e30aa2987823ece900e24b48822b26f4bf20234b6 WHIRLPOOL b50617472d6355462c0faf524db981a828cb59f9f110009b0a590d846b254a8041196b2ced11ad1c7814e5e0e17a1a9626b9fc3fdb1bad5f59fdfd7b142853fc
-EBUILD glusterfs-3.4.1.ebuild 4645 SHA256 483cca116cd466ab68084bb739aebbb2e05e62f0bbea83ec379613e2c1a96695 SHA512 1606ef3daca5ba7ad8e81f8c2be6e36736a2fa17d1e55d161c12b0ff297980468bd6a0f9e3833b7fd305d7e6aacfa4df26955e3adb0dceb593debe9b0dc08333 WHIRLPOOL ca65b7a493a5e3bee2a8a91bcb78a46bf6cc56e1368c04613dea516e1a8392ce7d69f1272eb5786c5810866e73050f08323968548ba358cfc36332e8be3cd989
-EBUILD glusterfs-3.4.2.ebuild 4645 SHA256 7313fba60404ded2556f488a81bdb8e592e43a2c053f5535a6300b84a8c27d41 SHA512 3f1b921a3c18d35ec6e1b896edb9c14277bd7c90f25341084e0198ac55aadd6664edd795ddffa11aa8852ff164cfd49a1969319179e3b7efe55103f371defff3 WHIRLPOOL a8dd1569c3b93629729f50ef1db508fe1ada2db7c9456fd3a6e7a65a3eff7d4f27ae0e96f323acb46b6ac8f6fa84ec9cc5dbcf0d27bf6f912e58c4fdd93e6905
-MISC ChangeLog 10466 SHA256 1fd28132ee2c078f3179d2f80e21729c5c762efdef6f06c01c45cd10f00d03c9 SHA512 c92170e8b2a9e9c08c290d5db9a2b474a56d1df81b4eb36bf9415c2d70536763f68450b61cf076aa3ec7f04260fd1432bf8188608bd2743c9e1410aca8679b34 WHIRLPOOL c48fffa4ffcfe019e12bfa8ac8526951ca87d1a61c21a57949ad8fa814215bf810d3a052c813609aa074ee662e05c408f48da2cd4dee5a7a15c435535116189c
+EBUILD glusterfs-3.4.2-r1.ebuild 4638 SHA256 b2bcb8fccaeec4497e530b7f35b5fd0d8a4c11a03db79ff8150d1ea42073d5b1 SHA512 adbbc2696670439d031273a0d5fde1882585a0361d73e78826d1adb4cf44dd9256361fe5e9f626655a0365c4d2c49d9725b869cfa7170507c17eab60049cb632 WHIRLPOOL a1bdf5ac317dde52303ba5d806bf9c5ed1207102f478f9ce2c87f28b1c802e680e0068dd2e059573cdb619746e9968257fd6dcf7400bf759253d5aaf974bdeec
+MISC ChangeLog 10963 SHA256 ecf3bac3137deb458baefc25eb2b348129d8d427ac5e9626cb7266571cb95b54 SHA512 db76fa11dcbee4c1354073ee906a6f37efa72d26c767b73d69a8044b3f98d9b472c5404ebec80fb97fe19cdd8c1ed090d303aaed0c483ebbaa9212f08a407751 WHIRLPOOL 4e04c6a2d9953d3e17473cd02a7586865651b345921c45e937025dfd6ff34c713d63fd85edbed20301f176fbbb81aee173dabcde38e24ff60ac1ae1f328a53b9
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlL+ItkACgkQKiQSS7ZY+hMmbAEAi5D0sKUp47H0xBhuIBGeroCc
-vyQMtHc3jLLQuKn58kQBAJct9vk7Td3UCVwt/zayM9NUMJ3OVxjDdryU2jQMuhJf
-=YnMC
+iQIcBAEBCAAGBQJTC0SGAAoJEF0huFKJUZL5+g4P/1ijEPYYj+yRaWAgjNcgfG1O
+C87nSZKSh3Y8aAz2mJrbP7IT8NCoEmP0/DJmPaRA4OPTvrlYZuB3fyjMIbZnR4Xv
+MR274Lput1pmpm8Fh4Fb5QsoAiCOPlec4gA/V0glxn60bivhaneW3IfyPh0duL42
+MdkwqdqzKXnelIvFfkVBwnvD6UJgDY74oDI1xcozwVKuSFpKu1xTNhY+jcnE4BpO
+tjzyxN3evL05g6kTUrjYEHlIIjZzHLu0PMYn84Os6rU0tHDxzVo/CKkoMoVAmzF3
+b3AGb1fZRt0XRUFLrz/ikAvmqJkU0GS8SV16oq5v7/JBbAB4Vx+dlC1yby822ncH
+oC1EiDCuRFmelwOdQxDEKonvB5Pa+upLSa6Ohw+dq2UPBCqoYWtC94I5EVOuXzKX
+8fTJIy5f13IuGKLQjh6jJeIAfpZA/YjoJwWqKZ5lFJNvjaWlPKEI8uakST9WawPQ
+S299fAik+g+mxFmRKJm4ru2JNwhvVAoCtqbUWkZKO38oeGofFQOLo3gMxgdmy8Qz
+FGHXjknm+NOoPwk0ep9RbLSJUPXajxS+8uKGTjZ1u/Xg6vTlm376f7JUWWWaXu4i
+VdpPJM+QBAHWyLOmlGnie1o/EbSwid8rBXDUkNUTqvZIHP1ij/mpo2jlmLv2McsA
+OpaCsRwqPiVeOPkp9hhM
+=stx9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-gfapi-handle-failures-in-graph-switches.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-gfapi-handle-failures-in-graph-switches.patch
deleted file mode 100644
index 91da4f0adecc..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-gfapi-handle-failures-in-graph-switches.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ccb48ebfafba7ba50d3fb156ecd8ba9666577fd2 Mon Sep 17 00:00:00 2001
-From: Anand Avati <avati@redhat.com>
-Date: Sun, 21 Jul 2013 00:43:18 -0700
-Subject: [PATCH] gfapi: handle failures in graph switches
-
-A graph switch failure can potentially result in NULL returned
-for glfs_active_subvol(). Handle this gracefully in glfs_subvol_done()
-
-Change-Id: I6adbd878c354b9ed2314fc71cea4671792efa0a4
-BUG: 953694
-Signed-off-by: Anand Avati <avati@redhat.com>
-Reviewed-on: http://review.gluster.org/5427
-Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-Tested-by: Gluster Build System <jenkins@build.gluster.com>
----
- api/src/glfs-resolve.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c
-index 4a634df..beb2703 100644
---- a/api/src/glfs-resolve.c
-+++ b/api/src/glfs-resolve.c
-@@ -797,6 +797,9 @@ glfs_subvol_done (struct glfs *fs, xlator_t *subvol)
- 	int ref = 0;
- 	xlator_t *active_subvol = NULL;
- 
-+	if (!subvol)
-+		return;
-+
- 	glfs_lock (fs);
- 	{
- 		ref = (--subvol->winds);
--- 
-1.7.4.1
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-glusterfsd-Use-dynamic-volfile-buffer.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-glusterfsd-Use-dynamic-volfile-buffer.patch
deleted file mode 100644
index b293f136b6bf..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-glusterfsd-Use-dynamic-volfile-buffer.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 1127d5143c27532c07c694a4088dbeae48a1504c Mon Sep 17 00:00:00 2001
-From: Kaushal M <kaushal@redhat.com>
-Date: Mon, 22 Jul 2013 19:14:56 +0530
-Subject: [PATCH] glusterfsd: Use dynamic volfile buffer
-
-Backport of
- fa78792 glusterfsd: Use dynamic volfile buffer
-from the master branch.
-
-Glusterfsd used a fixed buffer to store volfiles fetched via getspec.
-This caused problems with large volfiles. Changining this to a dynamic
-buffer allows large volfiles to be loaded in memory.
-
-BUG: 986100
-Change-Id: I9ec86c09a00bc84fef7a0da05bbeb6b3e07d5146
-Signed-off-by: Kaushal M <kaushal@redhat.com>
-Reviewed-on: http://review.gluster.org/5431
-Tested-by: Gluster Build System <jenkins@build.gluster.com>
-Reviewed-by: Vijay Bellur <vbellur@redhat.com>
----
- glusterfsd/src/glusterfsd-mgmt.c |   21 ++++++++++++++++++++-
- 1 files changed, 20 insertions(+), 1 deletions(-)
-
-diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
-index 8082ad3..d20303a 100644
---- a/glusterfsd/src/glusterfsd-mgmt.c
-+++ b/glusterfsd/src/glusterfsd-mgmt.c
-@@ -1391,7 +1391,7 @@ out:
- 
- 
- /* XXX: move these into @ctx */
--static char oldvolfile[131072];
-+static char *oldvolfile = NULL;
- static int oldvollen = 0;
- 
- static int
-@@ -1552,6 +1552,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
-         int                      ret   = 0;
-         ssize_t                  size = 0;
-         FILE                    *tmpfp = NULL;
-+        char                    *volfilebuf = NULL;
- 
-         frame = myframe;
-         ctx = frame->this->ctx;
-@@ -1609,6 +1610,15 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
-         if (ret == 0) {
-                 gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
-                         "No need to re-load volfile, reconfigure done");
-+                if (oldvolfile)
-+                        volfilebuf = GF_REALLOC (oldvolfile, size);
-+                else
-+                        volfilebuf = GF_CALLOC (1, size, gf_common_mt_char);
-+                if (!volfilebuf) {
-+                        ret = -1;
-+                        goto out;
-+                }
-+                oldvolfile = volfilebuf;
-                 oldvollen = size;
-                 memcpy (oldvolfile, rsp.spec, size);
-                 goto out;
-@@ -1625,6 +1635,15 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
-         if (ret)
-                 goto out;
- 
-+        if (oldvolfile)
-+                volfilebuf = GF_REALLOC (oldvolfile, size);
-+        else
-+                volfilebuf = GF_CALLOC (1, size, gf_common_mt_char);
-+        if (!volfilebuf) {
-+                ret = -1;
-+                goto out;
-+        }
-+        oldvolfile = volfilebuf;
-         oldvollen = size;
-         memcpy (oldvolfile, rsp.spec, size);
-         if (!is_mgmt_rpc_reconnect) {
--- 
-1.7.4.1
-
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch
deleted file mode 100644
index 61931da70e50..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-parallel-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 54010c34747e410f8332d1f4f85dcc2914836a88 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Fri, 26 Jul 2013 13:34:40 +0200
-Subject: [PATCH] Add workaround for broken parallel install with _LTLIBRARIES.
-
----
- api/src/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/api/src/Makefile.am b/api/src/Makefile.am
-index 8980c02..0782435 100644
---- a/api/src/Makefile.am
-+++ b/api/src/Makefile.am
-@@ -17,6 +17,10 @@ libgfapi_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
- 
- xlator_LTLIBRARIES = api.la
- xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mount
-+# workaround for broken parallel install support in automake with LTLIBRARIES
-+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
-+install_xlatorLTLIBRARIES = install-xlatorLTLIBRARIES
-+$(install_xlatorLTLIBRARIES): install-libLTLIBRARIES
- 
- api_la_SOURCES = glfs-master.c
- api_la_DEPENDENCIES = libgfapi.la
--- 
-1.8.2.1
-
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
deleted file mode 100644
index 805f664661b1..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.0-r1.ebuild,v 1.4 2014/02/14 14:06:11 ultrabug 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}/${P}-parallel-build.patch"
-	"${FILESDIR}/${P}-gfapi-handle-failures-in-graph-switches.patch"
-	"${FILESDIR}/${P}-glusterfsd-Use-dynamic-volfile-buffer.patch"
-	"${FILESDIR}/${P}-nfs-exit-when-all-volumes-are-disabled.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 fuse-client)
-		$(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
-
-	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
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild
index 97e4670c7816..073a82e1be7b 100644
--- a/sys-cluster/glusterfs/glusterfs-3.4.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2-r1.ebuild,v 1.1 2014/02/24 13:10:08 xarthisius Exp $
 
 EAPI=5
 
@@ -63,7 +63,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable bd-xlator )
 		$(use_enable fuse fuse-client)
-		$(use_enable georeplication fuse-client)
+		$(use_enable georeplication)
 		$(use_enable infiniband ibverbs)
 		$(use_enable static-libs static)
 		$(use_enable systemtap)
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
deleted file mode 100644
index 4dbfabbeb5ad..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.2.ebuild,v 1.2 2014/02/14 14:06:11 ultrabug 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.0-nfs-exit-when-all-volumes-are-disabled.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 fuse-client)
-		$(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
-
-	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
-}