Patch from bouyer@

- #include <signal.h> for sigprocmask(2) else we break without COMPAT_13
- usleep(3) shall not be called with argument higher than one second

4 files changed, 37 insertions, 9 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index afd24a237f4..98c91651561 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2011/10/02 01:11:47 manu Exp $
+# $NetBSD: Makefile,v 1.19 2011/10/16 05:45:19 manu Exp $
 #
 
 DISTNAME=	glusterfs-3.2.3
-PKGREVISION=	1
+PKGREVISION=	2
 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 b666431837f..f67eb9c0aa0 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/10/06 02:19:05 manu Exp $
+$NetBSD: distinfo,v 1.15 2011/10/16 05:45:19 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) = 981ee73c7b389d21c173eb4318d09a41bd47a706
+SHA1 (patch-ae) = 9bdd7695aa7ea655ace449ea2f6c13e570ea738e
 SHA1 (patch-af) = ac9333cc55ad0cf42233e3c69b32e22c483c077a
 SHA1 (patch-an) = 21f56d5379023bd2ea3432b4e3e3f9a0979c496f
 SHA1 (patch-ao) = 26e350655e276c8cb3ecb3cc9b7c0a4e7ab2ff7b
@@ -31,3 +31,4 @@ SHA1 (patch-bs) = d2f79ef19143f74f5a12187ea2dfd9e1ed92b726
 SHA1 (patch-bt) = 58f8e5ce66e6b691dd9972bd649dc18f7d5a258a
 SHA1 (patch-bu) = 006a6802958fad3950eadad456e362b7f4c2ca4a
 SHA1 (patch-bv) = 2c3b654e5858bf0948307ca6ae7048e276fca9ef
+SHA1 (patch-bw) = dca12eb81163fd1a0ada13165e990ddcb8fefbf2
diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae
index dab51f84e3f..6e78d978a1d 100644
--- a/filesystems/glusterfs/patches/patch-ae
+++ b/filesystems/glusterfs/patches/patch-ae
@@ -1,14 +1,18 @@
-$NetBSD: patch-ae,v 1.7 2011/09/18 01:36:06 manu Exp $
+$NetBSD: patch-ae,v 1.8 2011/10/16 05:45:19 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)
+
 --- contrib/fuse-lib/mount.c.orig	2011-08-23 14:31:36.000000000 +0200
-+++ contrib/fuse-lib/mount.c	2011-09-17 15:45:29.000000000 +0200
-@@ -19,16 +19,23 @@
++++ contrib/fuse-lib/mount.c	2011-10-14 15:15:40.000000000 +0200
+@@ -19,16 +19,24 @@
  #include <limits.h>
  #include <fcntl.h>
  #include <errno.h>
  #include <dirent.h>
++#include <signal.h>
 +#ifndef __NetBSD__
  #include <mntent.h>
 +#endif /* __NetBSD__ */
@@ -28,7 +32,7 @@ inexistant /etc/mtab management.
  #define MALLOC(size) malloc (size)
  #define FREE(ptr) free (ptr)
  #define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__)
-@@ -57,8 +64,9 @@
+@@ -57,8 +65,9 @@
   * - s/free/FREE/, s/malloc/MALLOC/
   * - there are some other minor things
   */
@@ -38,7 +42,7 @@ inexistant /etc/mtab management.
  mtab_needs_update (const char *mnt)
  {
          int res;
-@@ -90,8 +98,11 @@
+@@ -90,8 +99,11 @@
          }
  
          return 1;
diff --git a/filesystems/glusterfs/patches/patch-bw b/filesystems/glusterfs/patches/patch-bw
new file mode 100644
index 00000000000..0b894fc1c9a
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-bw
@@ -0,0 +1,23 @@
+$NetBSD: patch-bw,v 1.1 2011/10/16 05:45:19 manu Exp $
+
+usleep(3) shall not be called with argument higher than 1s
+
+--- libglusterfs/src/timer.c.orig	2011-10-14 15:06:12.000000000 +0200
++++ libglusterfs/src/timer.c	2011-10-14 15:18:16.000000000 +0200
+@@ -136,6 +136,7 @@
+ gf_timer_proc (void *ctx)
+ {
+         gf_timer_registry_t *reg = NULL;
++	const struct timespec sleepts = {.tv_sec = 1, .tv_nsec = 0, };
+ 
+         if (ctx == NULL)
+         {
+@@ -178,7 +179,7 @@
+                         else
+                                 break;
+                 }
+-                usleep (1000000);
++                nanosleep (&sleepts, NULL);
+         }
+ 
+         pthread_mutex_lock (&reg->lock);