CVS commit: pkgsrc/security/rvault

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 11 09:14:01 UTC 2025

Modified Files:
        pkgsrc/security/rvault: distinfo
        pkgsrc/security/rvault/patches: patch-fuse_rvaultfs.c

Log Message:
rvault: try fixing build on NetBSD 9


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/rvault/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c

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

Modified files:

Index: pkgsrc/security/rvault/distinfo
diff -u pkgsrc/security/rvault/distinfo:1.11 pkgsrc/security/rvault/distinfo:1.12
--- pkgsrc/security/rvault/distinfo:1.11        Thu Jan 23 02:36:52 2025
+++ pkgsrc/security/rvault/distinfo     Tue Feb 11 09:14:01 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2025/01/23 02:36:52 pho Exp $
+$NetBSD: distinfo,v 1.12 2025/02/11 09:14:01 wiz Exp $
 
 BLAKE2s (rvault-0.3.tar.gz) = 4ff52e5edf6156c4c9cc0046f02ef8845e9678a2c4719c64a1f7e83a040bd1b6
 SHA512 (rvault-0.3.tar.gz) = 0687d14cf646adccb3c09a3d5a16e771ef9b046bd4e596a487413e83e06709b27a62c2f08a9a23d47f6253cadc1fb7cbe53262455faa6628d5b23d8539f12271
 Size (rvault-0.3.tar.gz) = 76921 bytes
 SHA1 (patch-Makefile) = 2dff59157d80a067b46ebda143eb15aa64b08252
 SHA1 (patch-core_cli.c) = 8214fe7f75273a0d434751b600d89d70f735a24c
-SHA1 (patch-fuse_rvaultfs.c) = 19c5ac4ed80bf732b004b586b2ac546828f4b9a4
+SHA1 (patch-fuse_rvaultfs.c) = f1241b83c9fbf0985181bd74c19259afd67f8464

Index: pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c
diff -u pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c:1.1 pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c:1.2
--- pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c:1.1    Thu Jan 23 02:36:52 2025
+++ pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c        Tue Feb 11 09:14:01 2025
@@ -1,40 +1,26 @@
-$NetBSD: patch-fuse_rvaultfs.c,v 1.1 2025/01/23 02:36:52 pho Exp $
-
-Remove __NetBSD__ workaround for old versions of NetBSD librefuse. The
-workaround now cause a build failure.
+$NetBSD: patch-fuse_rvaultfs.c,v 1.2 2025/02/11 09:14:01 wiz Exp $
 
+Limit __NetBSD__ workaround to versions before NetBSD 10.
 https://github.com/rmind/rvault/pull/66
 
---- fuse/rvaultfs.c.orig       2025-01-23 02:03:33.171342947 +0000
+--- fuse/rvaultfs.c.orig       2025-02-11 09:11:35.416381709 +0000
 +++ fuse/rvaultfs.c
-@@ -499,22 +499,6 @@ rvaultfs_run(rvault_t *vault, const char
+@@ -19,6 +19,9 @@
+ #include <dirent.h>
+ #include <errno.h>
+ #include <err.h>
++#ifdef __NetBSD__
++#include <sys/param.h>
++#endif
+ 
+ #define       FUSE_USE_VERSION        26
+ #include <fuse.h>
+@@ -499,7 +502,7 @@ rvaultfs_run(rvault_t *vault, const char
        if (debug) {
                fuse_opt_add_arg(&args, "-odebug");
        }
 -#if defined(__NetBSD__)
--      fuse = fuse_new(&args, &rvaultfs_ops, sizeof(rvaultfs_ops), vault);
--      if (fuse == NULL) {
--              return -1;
--      }
--      if (fuse_mount(fuse, mountpoint) == -1) {
--              fuse_destroy(fuse);
--              return -1;
--      }
--      if (!fg) {
--              (void)fuse_daemonize(fuse);
--      }
--      ret = fuse_loop(fuse);
--      app_log(LOG_DEBUG, "%s: exited fuse_loop() with %d", __func__, ret);
--      fuse_unmount(fuse);
--#else
-       struct fuse_chan *chan;
- 
-       if ((chan = fuse_mount(mountpoint, &args)) == NULL) {
-@@ -529,7 +513,6 @@ rvaultfs_run(rvault_t *vault, const char
-       ret = fuse_loop(fuse);
-       app_log(LOG_DEBUG, "%s: exited fuse_loop() with %d", __func__, ret);
-       fuse_unmount(mountpoint, chan);
--#endif
-       fuse_destroy(fuse);
-       fuse_opt_free_args(&args);
-       return ret;
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 1000000000)
+       fuse = fuse_new(&args, &rvaultfs_ops, sizeof(rvaultfs_ops), vault);
+       if (fuse == NULL) {
+               return -1;