diff options
| author | manu <manu@pkgsrc.org> | 2011-11-28 08:42:38 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2011-11-28 08:42:38 +0000 |
| commit | 49f1bffa12628d9a230345aaf38807184677d4ba (patch) | |
| tree | 17d64e4832be222100fe2dbe0779b27a4ec95b4a /filesystems/glusterfs/patches/patch-ae | |
| parent | 6cc12c90a2c7b126a2c41cffd50c5f5283e5672e (diff) | |
| download | pkgsrc-49f1bffa12628d9a230345aaf38807184677d4ba.tar.gz | |
Update to glusterfs 3.2.5. This is a bug-fix release
Diffstat (limited to 'filesystems/glusterfs/patches/patch-ae')
| -rw-r--r-- | filesystems/glusterfs/patches/patch-ae | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae index 48889308ada..ad22ecba1de 100644 --- a/filesystems/glusterfs/patches/patch-ae +++ b/filesystems/glusterfs/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.9 2011/11/24 05:36:36 manu Exp $ +$NetBSD: patch-ae,v 1.10 2011/11/28 08:42:39 manu Exp $ On NetBSD use libperfuse(3), rename umount2(2) as unmount(2), and skip inexistant /etc/mtab management. @@ -7,8 +7,8 @@ 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-11-24 03:31:11.000000000 +0100 +--- contrib/fuse-lib/mount.c.orig 2011-11-14 14:45:58.000000000 +0100 ++++ contrib/fuse-lib/mount.c 2011-11-27 08:53:09.000000000 +0100 @@ -19,16 +19,30 @@ #include <limits.h> #include <fcntl.h> @@ -78,3 +78,24 @@ Use /sbin/mount on NetBSD, not /bin/mount } res = waitpid (res, &status, 0); if (res == -1) +@@ -562,8 +580,9 @@ + goto out; + else + mounted = 1; + ++#ifndef __NetBSD__ + if (geteuid () == 0) { + char *newmnt = fuse_mnt_resolve_path ("fuse", mountpoint); + + if (!newmnt) { +@@ -580,8 +599,9 @@ + + goto out; + } + } ++#endif /* __NetBSD__ */ + + out: + if (ret == -1) { + if (mounted) + |