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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)

7 files changed, 14 insertions, 437 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/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
-}