summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2013-04-03 15:03:44 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2013-04-03 15:03:44 +0000
commitc473052163d176ac762209aab08f6a2e3f96812d (patch)
treebe060d0420bcd93cd460914555c209cde49efcc8 /sys-cluster
parentVersion bump (diff)
downloadgentoo-2-c473052163d176ac762209aab08f6a2e3f96812d.tar.gz
gentoo-2-c473052163d176ac762209aab08f6a2e3f96812d.tar.bz2
gentoo-2-c473052163d176ac762209aab08f6a2e3f96812d.zip
Expect that gsync resides in /usr/libexec/glusterfs on remote machine or in other words that the remote machine runs Gentoo too. Fixes #464196 by Francesco Riosa <francesco+gentoo_bugzilla@pnpitalia.it> who also provided the patch
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 895192F9)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/glusterfs/ChangeLog12
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.3.0.ebuild4
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild (renamed from sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild)4
3 files changed, 16 insertions, 4 deletions
diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index ae5d60eb2a1c..d8eb62c666d9 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for sys-cluster/glusterfs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.45 2013/04/02 17:00:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.46 2013/04/03 15:03:44 xarthisius Exp $
+
+*glusterfs-3.3.1-r2 (03 Apr 2013)
+
+ 03 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org>
+ +glusterfs-3.3.1-r2.ebuild, -glusterfs-3.3.1-r1.ebuild,
+ glusterfs-3.3.0.ebuild:
+ Expect that gsync resides in /usr/libexec/glusterfs on remote machine or in
+ other words that the remote machine runs Gentoo too. Fixes #464196 by
+ Francesco Riosa <francesco+gentoo_bugzilla@pnpitalia.it> who also provided the
+ patch
02 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
Drop alexxy from metadata per his request
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
index be48c986f392..9e6d4fb55bf0 100644
--- a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.3 2012/11/19 13:36:35 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.4 2013/04/03 15:03:44 xarthisius Exp $
EAPI=4
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
index cdd7c20fd5fe..7690f1dfc2f0 100644
--- a/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild,v 1.1 2013/01/06 09:52:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild,v 1.1 2013/04/03 15:03:44 xarthisius Exp $
EAPI=4
@@ -47,6 +47,8 @@ src_prepare() {
-i argp-standalone/configure.ac || die
sed -e "s:\$(PYTHON):${PREFIX}/usr/bin/python2:g" \
-i xlators/features/marker/utils/src/Makefile.am || die #446330
+ sed -e 's:"/usr/local/libexec/glusterfs:GSYNCD_PREFIX":' \
+ -i xlators/mgmt/glusterd/src/glusterd.c || die #464196
autotools-utils_src_prepare
cd argp-standalone && eautoreconf
}