CVS commit: pkgsrc/filesystems/fuse-wdfs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 22 18:50:23 UTC 2022

Modified Files:
        pkgsrc/filesystems/fuse-wdfs: Makefile distinfo
        pkgsrc/filesystems/fuse-wdfs/patches: patch-aa

Log Message:
Conditionalise workarounds for old NetBSD librefuse


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/filesystems/fuse-wdfs/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/filesystems/fuse-wdfs/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/fuse-wdfs/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse-wdfs/Makefile
diff -u pkgsrc/filesystems/fuse-wdfs/Makefile:1.22 pkgsrc/filesystems/fuse-wdfs/Makefile:1.23
--- pkgsrc/filesystems/fuse-wdfs/Makefile:1.22  Wed Dec  8 16:04:21 2021
+++ pkgsrc/filesystems/fuse-wdfs/Makefile       Sat Jan 22 18:50:23 2022
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.22 2021/12/08 16:04:21 adam Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/22 18:50:23 pho Exp $
 #
 
 DISTNAME=      wdfs-1.4.2
 PKGNAME=       fuse-${DISTNAME}
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    filesystems
 MASTER_SITES=  http://noedler.de/projekte/wdfs/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://noedler.de/projekte/wdfs/
 COMMENT=       FUSE-based webdav filesystem
+LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    pkg-config

Index: pkgsrc/filesystems/fuse-wdfs/distinfo
diff -u pkgsrc/filesystems/fuse-wdfs/distinfo:1.7 pkgsrc/filesystems/fuse-wdfs/distinfo:1.8
--- pkgsrc/filesystems/fuse-wdfs/distinfo:1.7   Tue Oct 26 10:25:29 2021
+++ pkgsrc/filesystems/fuse-wdfs/distinfo       Sat Jan 22 18:50:23 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:25:29 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/01/22 18:50:23 pho Exp $
 
 BLAKE2s (wdfs-1.4.2.tar.gz) = 8048713564688dc8e4529a93d31612638065d346fdcec98e2329600cf6d2bb75
 SHA512 (wdfs-1.4.2.tar.gz) = da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004
 Size (wdfs-1.4.2.tar.gz) = 109315 bytes
-SHA1 (patch-aa) = 050b27b342e28419eeb63115ed90f16b246bc1e5
+SHA1 (patch-aa) = 1acb91eea14670c048eba39f48deb88a6c52d8cf
 SHA1 (patch-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64

Index: pkgsrc/filesystems/fuse-wdfs/patches/patch-aa
diff -u pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.3 pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.4
--- pkgsrc/filesystems/fuse-wdfs/patches/patch-aa:1.3   Sat Feb 16 01:24:39 2008
+++ pkgsrc/filesystems/fuse-wdfs/patches/patch-aa       Sat Jan 22 18:50:23 2022
@@ -1,27 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2008/02/16 01:24:39 bjs Exp $
+$NetBSD: patch-aa,v 1.4 2022/01/22 18:50:23 pho Exp $
 
-If refuse(3) ever supports -ho in option_list, the #ifndef __NetBSD__ 
-should be removed.
+refuse(3) used to not support -ho in option_list. Already fixed in
+HEAD.
 
---- src/wdfs-main.c.orig       2007-04-12 04:30:08.000000000 -0400
+--- src/wdfs-main.c.orig       2007-04-12 08:30:08.000000000 +0000
 +++ src/wdfs-main.c
-@@ -131,14 +131,24 @@ static struct fuse_opt wdfs_opts[] = {
-       FUSE_OPT_END
- };
- 
-+#ifndef FUSE_USE_VERSION
-+#define FUSE_USE_VERSION FUSE_VERSION
-+#endif
-+
- static int wdfs_opt_proc(
-       void *data, const char *option, int key, struct fuse_args *option_list)
- {
+@@ -137,8 +137,14 @@ static int wdfs_opt_proc(
        switch (key) {
                case KEY_HELP:
                        print_help();
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) || FUSE_H_ >= 20211204
 +/*
-+ * XXX Using refuse(3), this results in abnormal program termination
++ * XXX Using refuse(3), this resulted in abnormal program termination
 + *     with SIG_SEGV.
 + */
                        fuse_opt_add_arg(option_list, "-ho");
@@ -30,22 +20,3 @@ should be removed.
                        exit(1);
  
                case KEY_VERSION:
-@@ -1213,7 +1223,8 @@ static int wdfs_statfs(const char *local
- 
- 
- /* just say hello when fuse takes over control. */
--#if FUSE_VERSION >= 26
-+
-+#if FUSE_USE_VERSION >= 26
-       static void* wdfs_init(struct fuse_conn_info *conn)
- #else
-       static void* wdfs_init()
-@@ -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)
- {
--#if FUSE_VERSION >= 26
-+#if FUSE_USE_VERSION >= 26
-       return fuse_main(args->argc, args->argv, &wdfs_operations, NULL);
- #else
-       return fuse_main(args->argc, args->argv, &wdfs_operations);