summaryrefslogtreecommitdiff
path: root/filesystems/fuse-wdfs
diff options
context:
space:
mode:
authorbjs <bjs@pkgsrc.org>2008-02-16 01:24:39 +0000
committerbjs <bjs@pkgsrc.org>2008-02-16 01:24:39 +0000
commit4803630cf198b5325f3feb459f76b6dee23d5674 (patch)
tree3c526df29d929d3a1b9e39e7f2f461983a3a1ae8 /filesystems/fuse-wdfs
parent466820f00de37865dd5d39a7b56de64eef37ac4f (diff)
downloadpkgsrc-4803630cf198b5325f3feb459f76b6dee23d5674.tar.gz
#ifndef out some code which results in SIG_SEGV on NetBSD. See patch-aa.
Bump rev.
Diffstat (limited to 'filesystems/fuse-wdfs')
-rw-r--r--filesystems/fuse-wdfs/Makefile3
-rw-r--r--filesystems/fuse-wdfs/distinfo4
-rw-r--r--filesystems/fuse-wdfs/patches/patch-aa25
3 files changed, 25 insertions, 7 deletions
diff --git a/filesystems/fuse-wdfs/Makefile b/filesystems/fuse-wdfs/Makefile
index 8579af6cd0a..8608ab4b0de 100644
--- a/filesystems/fuse-wdfs/Makefile
+++ b/filesystems/fuse-wdfs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/28 02:56:46 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/16 01:24:39 bjs Exp $
#
DISTNAME= wdfs-1.4.2
PKGNAME= fuse-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= filesystems
MASTER_SITES= http://noedler.de/projekte/wdfs/
diff --git a/filesystems/fuse-wdfs/distinfo b/filesystems/fuse-wdfs/distinfo
index b8a46af761c..c5918d3737a 100644
--- a/filesystems/fuse-wdfs/distinfo
+++ b/filesystems/fuse-wdfs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/01/28 02:56:46 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/02/16 01:24:39 bjs Exp $
SHA1 (wdfs-1.4.2.tar.gz) = 71ae2e355d00bc1fbe7093b0a3b15ddc76a74516
RMD160 (wdfs-1.4.2.tar.gz) = 101702c0aaf66c2d2b24ae768a5e910756432c1a
Size (wdfs-1.4.2.tar.gz) = 109315 bytes
-SHA1 (patch-aa) = 47e5145eb0639ea87807bc521f8611517a9b78cc
+SHA1 (patch-aa) = 050b27b342e28419eeb63115ed90f16b246bc1e5
SHA1 (patch-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64
diff --git a/filesystems/fuse-wdfs/patches/patch-aa b/filesystems/fuse-wdfs/patches/patch-aa
index ce608d06d6b..82d68535708 100644
--- a/filesystems/fuse-wdfs/patches/patch-aa
+++ b/filesystems/fuse-wdfs/patches/patch-aa
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2008/01/28 02:56:46 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2008/02/16 01:24:39 bjs Exp $
+
+If refuse(3) ever supports -ho in option_list, the #ifndef __NetBSD__
+should be removed.
--- src/wdfs-main.c.orig 2007-04-12 04:30:08.000000000 -0400
+++ src/wdfs-main.c
-@@ -131,6 +131,10 @@ static struct fuse_opt wdfs_opts[] = {
+@@ -131,14 +131,24 @@ static struct fuse_opt wdfs_opts[] = {
FUSE_OPT_END
};
@@ -13,7 +16,21 @@ $NetBSD: patch-aa,v 1.2 2008/01/28 02:56:46 bjs Exp $
static int wdfs_opt_proc(
void *data, const char *option, int key, struct fuse_args *option_list)
{
-@@ -1213,7 +1217,8 @@ static int wdfs_statfs(const char *local
+ switch (key) {
+ case KEY_HELP:
+ print_help();
++#ifndef __NetBSD__
++/*
++ * XXX Using refuse(3), this results in abnormal program termination
++ * with SIG_SEGV.
++ */
+ fuse_opt_add_arg(option_list, "-ho");
+ call_fuse_main(option_list);
++#endif
+ exit(1);
+
+ case KEY_VERSION:
+@@ -1213,7 +1223,8 @@ static int wdfs_statfs(const char *local
/* just say hello when fuse takes over control. */
@@ -23,7 +40,7 @@ $NetBSD: patch-aa,v 1.2 2008/01/28 02:56:46 bjs Exp $
static void* wdfs_init(struct fuse_conn_info *conn)
#else
static void* wdfs_init()
-@@ -1308,7 +1313,7 @@ static void print_help()
+@@ -1308,7 +1319,7 @@ static void print_help()
/* just a simple wrapper for fuse_main(), because the interface changed... */
static int call_fuse_main(struct fuse_args *args)
{