CVS commit: pkgsrc/security/rvault

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 23 02:36:53 UTC 2025

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

Log Message:
security/rvault: Fix build on recent-ish NetBSD (probably >= 9)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/rvault/distinfo
cvs rdiff -u -r0 -r1.1 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.10 pkgsrc/security/rvault/distinfo:1.11
--- pkgsrc/security/rvault/distinfo:1.10        Wed Jul 12 21:30:42 2023
+++ pkgsrc/security/rvault/distinfo     Thu Jan 23 02:36:52 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2023/07/12 21:30:42 nia Exp $
+$NetBSD: distinfo,v 1.11 2025/01/23 02:36:52 pho 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

Added files:

Index: pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c
diff -u /dev/null pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c:1.1
--- /dev/null   Thu Jan 23 02:36:53 2025
+++ pkgsrc/security/rvault/patches/patch-fuse_rvaultfs.c        Thu Jan 23 02:36:52 2025
@@ -0,0 +1,40 @@
+$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.
+
+https://github.com/rmind/rvault/pull/66
+
+--- fuse/rvaultfs.c.orig       2025-01-23 02:03:33.171342947 +0000
++++ fuse/rvaultfs.c
+@@ -499,22 +499,6 @@ 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;