From 755797acd95a1e5e154f8ddc29a0150ac3e2a953 Mon Sep 17 00:00:00 2001
From: manu <manu@pkgsrc.org>
Date: Thu, 24 Nov 2011 05:36:36 +0000
Subject: Fix rebalance operation by using /sbin/mount instead of /bin/mount

---
 filesystems/glusterfs/Makefile         |  4 ++--
 filesystems/glusterfs/distinfo         |  4 ++--
 filesystems/glusterfs/patches/patch-ae | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 9 deletions(-)

(limited to 'filesystems')

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 9a2fd91c7ba..9fb296f161d 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2011/10/30 05:07:14 manu Exp $
+# $NetBSD: Makefile,v 1.23 2011/11/24 05:36:36 manu Exp $
 #
 
 DISTNAME=	glusterfs-3.2.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	filesystems
 MASTER_SITES=	http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.3/
 
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index e0c8329a145..226d572e119 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2011/10/30 05:07:14 manu Exp $
+$NetBSD: distinfo,v 1.19 2011/11/24 05:36:36 manu Exp $
 
 SHA1 (glusterfs-3.2.3.tar.gz) = 7a36e496d9ac3fbf11123bb42884445334d07f06
 RMD160 (glusterfs-3.2.3.tar.gz) = 89d6a5f9c1362e1fe4d88e69465311069552d319
@@ -6,7 +6,7 @@ Size (glusterfs-3.2.3.tar.gz) = 2376000 bytes
 SHA1 (patch-aa) = bfd1dbcb6945dd387d88bd96616e4bc29c3e0628
 SHA1 (patch-ab) = d240bfd8bd8e5994f612a3387cd75f30bb91c8d7
 SHA1 (patch-ac) = 21d86775c2174ea630404a1a329dfd49c7f493d9
-SHA1 (patch-ae) = 9bdd7695aa7ea655ace449ea2f6c13e570ea738e
+SHA1 (patch-ae) = 98c7ae07209e0870851007cda087ec381bd1f551
 SHA1 (patch-af) = ac9333cc55ad0cf42233e3c69b32e22c483c077a
 SHA1 (patch-an) = 21f56d5379023bd2ea3432b4e3e3f9a0979c496f
 SHA1 (patch-ao) = 26e350655e276c8cb3ecb3cc9b7c0a4e7ab2ff7b
diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae
index 6e78d978a1d..48889308ada 100644
--- a/filesystems/glusterfs/patches/patch-ae
+++ b/filesystems/glusterfs/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.8 2011/10/16 05:45:19 manu Exp $
+$NetBSD: patch-ae,v 1.9 2011/11/24 05:36:36 manu Exp $
 
 On NetBSD use libperfuse(3), rename umount2(2) as unmount(2), and skip
 inexistant /etc/mtab management.
 
 Include <signal.h> for sigprocmask(2)
 
+Use /sbin/mount on NetBSD, not /bin/mount
+
 --- contrib/fuse-lib/mount.c.orig	2011-08-23 14:31:36.000000000 +0200
-+++ contrib/fuse-lib/mount.c	2011-10-14 15:15:40.000000000 +0200
-@@ -19,16 +19,24 @@
++++ contrib/fuse-lib/mount.c	2011-11-24 03:31:11.000000000 +0100
+@@ -19,16 +19,30 @@
  #include <limits.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -27,12 +29,18 @@ Include <signal.h> for sigprocmask(2)
 +#include <perfuse.h>
 +#define umount2(dir, flags) unmount(dir, ((flags) != 0) ? MNT_FORCE : 0)
 +#endif
++
++#ifdef linux
++#define _PATH_MOUNT "/bin/mount"
++#else /* NetBSD, MacOS X */
++#define _PATH_MOUNT "/sbin/mount"
++#endif
 +
  #ifdef FUSE_UTIL
  #define MALLOC(size) malloc (size)
  #define FREE(ptr) free (ptr)
  #define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__)
-@@ -57,8 +65,9 @@
+@@ -57,8 +71,9 @@
   * - s/free/FREE/, s/malloc/MALLOC/
   * - there are some other minor things
   */
@@ -42,7 +50,7 @@ Include <signal.h> for sigprocmask(2)
  mtab_needs_update (const char *mnt)
  {
          int res;
-@@ -90,8 +99,11 @@
+@@ -90,8 +105,11 @@
          }
  
          return 1;
@@ -54,3 +62,19 @@ Include <signal.h> for sigprocmask(2)
  #ifndef FUSE_UTIL
  static
  #endif
+@@ -158,12 +176,12 @@
+                                        progname, tmp, strerror (errno));
+                         exit (1);
+                 }
+                 rmdir (tmp);
+-                execl ("/bin/mount", "/bin/mount", "-i", "-f", "-t", type,
++                execl (_PATH_MOUNT, _PATH_MOUNT, "-i", "-f", "-t", type,
+                        "-o", opts, fsname, mnt, NULL);
+-                GFFUSE_LOGERR ("%s: failed to execute /bin/mount: %s",
+-                               progname, strerror (errno));
++                GFFUSE_LOGERR ("%s: failed to execute %s: %s",
++                               progname, _PATH_MOUNT, strerror (errno));
+                 exit (1);
+         }
+         res = waitpid (res, &status, 0);
+         if (res == -1)
-- 
cgit v1.2.3