[pkgsrc/trunk]: pkgsrc Conditionalise workarounds for old NetBSD librefuse

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0f81b536d48
branches:  trunk
changeset: 372290:a0f81b536d48
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Jan 22 18:52:11 2022 +0000

description:
Conditionalise workarounds for old NetBSD librefuse

diffstat:

 filesystems/py-fuse-bindings/Makefile                               |   4 +-
 filesystems/py-fuse-bindings/distinfo                               |   4 +-
 filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c |  34 +++++----
 sysutils/open-vm-tools/distinfo                                     |   4 +-
 sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c           |  13 ++-
 5 files changed, 33 insertions(+), 26 deletions(-)

diffs (151 lines):

diff -r aeaae5a61e0f -r a0f81b536d48 filesystems/py-fuse-bindings/Makefile
--- a/filesystems/py-fuse-bindings/Makefile     Sat Jan 22 18:41:21 2022 +0000
+++ b/filesystems/py-fuse-bindings/Makefile     Sat Jan 22 18:52:11 2022 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2022/01/04 20:53:51 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/22 18:52:11 pho Exp $
 
 VERSION=               1.0.4
 DISTNAME=              fuse-python-${VERSION}
 PKGNAME=               ${PYPKGPREFIX}-fuse-bindings-${VERSION}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            filesystems python
 MASTER_SITES=          ${MASTER_SITE_PYPI:=f/fuse-python/}
 
diff -r aeaae5a61e0f -r a0f81b536d48 filesystems/py-fuse-bindings/distinfo
--- a/filesystems/py-fuse-bindings/distinfo     Sat Jan 22 18:41:21 2022 +0000
+++ b/filesystems/py-fuse-bindings/distinfo     Sat Jan 22 18:52:11 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/11/30 05:25:57 pho Exp $
+$NetBSD: distinfo,v 1.7 2022/01/22 18:52:11 pho Exp $
 
 BLAKE2s (fuse-python-1.0.4.tar.gz) = 32f3c1aeaf619880a0a366866b3e7650924b66eaafa187d6081dc3c94e1ac568
 SHA512 (fuse-python-1.0.4.tar.gz) = 12696c78f75591e56e00ca1e2a93b214993b939cac2e7aae5dc6d8e69dc1aa034f0244a876c9ff2fb7e49b928b7ff84b281fd98d8f3fe67140be33d7ea5fea20
 Size (fuse-python-1.0.4.tar.gz) = 49009 bytes
-SHA1 (patch-fuseparts___fusemodule.c) = b41472254c8db0f996e2a6691dbc6cc317285544
+SHA1 (patch-fuseparts___fusemodule.c) = a928bc35a6bf70460c37fc3f9db1ff5edc1a1d01
diff -r aeaae5a61e0f -r a0f81b536d48 filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c
--- a/filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c       Sat Jan 22 18:41:21 2022 +0000
+++ b/filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c       Sat Jan 22 18:52:11 2022 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-fuseparts___fusemodule.c,v 1.2 2021/11/30 05:25:58 pho Exp $
+$NetBSD: patch-fuseparts___fusemodule.c,v 1.3 2022/01/22 18:52:11 pho Exp $
+
+Hunk #0:
+    Workaround for NetBSD librefuse that had an API incompatible with
+    FUSE. Already fixed in HEAD.
 
-/*
- * This patch is not known to be filed upstream.
- *
- * It adapts for NetBSD's (re)fuse implementation, specifically
- *   the lack of an attribute (rdev)
- *   the lack of fuse_loop_mt(), fuse_invalidate(), fuse_setup(), and fuse_teardown()
- *   the lack of polling support
- */
+Hunk #1:
+    "os.stat()" doesn't always return st_rdev on all platforms. Do not
+    assume it exists.
+
+Hunk #2, #3:
+    The polling support has appeared on FUSE 2.8 but this module
+    defines FUSE_USE_VERSION to 26. ReFUSE doesn't expose the polling
+    API in this case. Eligible for upstreaming but haven't been done.
 
 --- fuseparts/_fusemodule.c.orig       2021-05-02 06:20:20.000000000 +0000
 +++ fuseparts/_fusemodule.c
@@ -15,19 +19,19 @@
     to fix compilation errors on FreeBSD
     Mikhail Zakharov <zmey20000%thoo.com@localhost> 2018.10.22 */
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) && FUSE_H_ < 20211204
 +
-+/* NetBSD librefuse doesn't support fuse_loop_mt() yet. Use the
++/* NetBSD librefuse didn't support fuse_loop_mt(). Use the
 + * single-threaded loop instead. This is harmless, only a missed
 + * opportunity for performance gain. */
 +#  define fuse_loop_mt(fuse) fuse_loop(fuse)
 +
-+/* NetBSD librefuse doesn't support fuse_invalidate() yet. Make it
++/* NetBSD librefuse didn't support fuse_invalidate(). Make it
 + * no-op. This too is harmless because librefuse caches nothing
 + * atm. */
 +#  define fuse_invalidate(fuse, path) 0
 +
-+/* fuse_setup() has been superseded by fuse_new(). */
++/* fuse_setup() had once been removed.. */
 +#include <fuse_lowlevel.h>
 +#include <signal.h>
 +
@@ -131,7 +135,7 @@
 +      return fuse;
 +}
 +
-+/* fuse_teardown() has been removed. */
++/* fuse_teardown() had once been removed. */
 +static void fuse_teardown(
 +      struct fuse *fuse,
 +      char *mountpoint __attribute__((__unused__)))
@@ -140,7 +144,7 @@
 +      fuse_unmount(fuse);
 +      fuse_destroy(fuse);
 +}
-+#endif /* defined(__NetBSD__) */
++#endif /* defined(__NetBSD__) && FUSE_H_ < 20211204 */
 +
  #define _IOC_NRBITS     8
  #define _IOC_TYPEBITS   8
diff -r aeaae5a61e0f -r a0f81b536d48 sysutils/open-vm-tools/distinfo
--- a/sysutils/open-vm-tools/distinfo   Sat Jan 22 18:41:21 2022 +0000
+++ b/sysutils/open-vm-tools/distinfo   Sat Jan 22 18:52:11 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2021/12/07 18:25:45 adam Exp $
+$NetBSD: distinfo,v 1.33 2022/01/22 18:52:44 pho Exp $
 
 BLAKE2s (open-vm-tools-11.3.5-18557794.tar.gz) = 6093fe8c71a826684fdc8eed50c3367450097b0fd94e39a0a23e45f44a97a635
 SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
@@ -53,5 +53,5 @@
 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768
 SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07
-SHA1 (patch-vmhgfs-fuse_config.c) = b991c62afde772b37a334341907242d4bc1f9dec
+SHA1 (patch-vmhgfs-fuse_config.c) = 0518ca08d9b5d268960e1a820899eaefd1d18361
 SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21
diff -r aeaae5a61e0f -r a0f81b536d48 sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c
--- a/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Sat Jan 22 18:41:21 2022 +0000
+++ b/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c Sat Jan 22 18:52:11 2022 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-vmhgfs-fuse_config.c,v 1.2 2016/11/21 00:16:29 wiz Exp $
+$NetBSD: patch-vmhgfs-fuse_config.c,v 1.3 2022/01/22 18:52:44 pho Exp $
 
 * The original SysCompatCheck() only works on Linux.
-* librefuse doesn't support the old style -ho option.
+* librefuse didn't support the old style -ho option. Fixed in HEAD.
 
---- vmhgfs-fuse/config.c.orig  2016-02-16 20:06:49.000000000 +0000
+--- vmhgfs-fuse/config.c.orig  2018-06-23 10:03:28.000000000 +0000
 +++ vmhgfs-fuse/config.c
 @@ -23,6 +23,7 @@
  
@@ -78,14 +78,17 @@
  
  
  /*
-@@ -444,7 +460,9 @@ vmhgfsOptProc(void *data,               
+@@ -444,7 +460,13 @@ vmhgfsOptProc(void *data,               
  
     case KEY_HELP:
        Usage(outargs->argv[0]);
--      fuse_opt_add_arg(outargs, "-ho");
++#if defined(__NetBSD__) && FUSE_H_ < 20211204
 +      fuse_opt_add_arg(outargs, "--help");
 +      free(outargs->argv[0]);
 +      outargs->argv[0] = strdup("");
++#else
+       fuse_opt_add_arg(outargs, "-ho");
++#endif
        fuse_main(outargs->argc, outargs->argv, NULL, NULL);
        exit(1);