CVS commit: pkgsrc/filesystems/fuse-obexfs

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 22 18:43:20 UTC 2022

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

Log Message:
Conditionalise workarounds for old NetBSD librefuse


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/filesystems/fuse-obexfs/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/filesystems/fuse-obexfs/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/fuse-obexfs/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-obexfs/Makefile
diff -u pkgsrc/filesystems/fuse-obexfs/Makefile:1.9 pkgsrc/filesystems/fuse-obexfs/Makefile:1.10
--- pkgsrc/filesystems/fuse-obexfs/Makefile:1.9 Tue Aug  1 16:47:38 2017
+++ pkgsrc/filesystems/fuse-obexfs/Makefile     Sat Jan 22 18:43:19 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2017/08/01 16:47:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/22 18:43:19 pho Exp $
 #
 
 DISTNAME=      obexfs-0.8
 PKGNAME=       fuse-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openobex/}
 
@@ -15,10 +15,6 @@ LICENSE=     gnu-gpl-v2
 GNU_CONFIGURE= yes
 USE_TOOLS+=    autoconf gmake pkg-config
 
-CPPFLAGS.NetBSD+=      -D_KERNTYPES
-
-BUILDLINK_API_DEPENDS.openobex+=       openobex>=1.3nb2
-
 pre-configure:
        cd ${WRKSRC} && autoconf
 

Index: pkgsrc/filesystems/fuse-obexfs/distinfo
diff -u pkgsrc/filesystems/fuse-obexfs/distinfo:1.5 pkgsrc/filesystems/fuse-obexfs/distinfo:1.6
--- pkgsrc/filesystems/fuse-obexfs/distinfo:1.5 Tue Oct 26 10:25:28 2021
+++ pkgsrc/filesystems/fuse-obexfs/distinfo     Sat Jan 22 18:43:19 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:25:28 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/22 18:43:19 pho Exp $
 
 BLAKE2s (obexfs-0.8.tar.gz) = f8e0463c0199df63e4c5111e3b947e56a594f159b2eea75e9f79ff82efb1472a
 SHA512 (obexfs-0.8.tar.gz) = 3fdca66b52315c8d119dd7ee3f48e974cc3b0834531dd99f8cdd61b8d7558a9899e4f25fef29461d5a9fc8c9dd1fdaccbf8af43521d75ddd413a45f48a26a73d
 Size (obexfs-0.8.tar.gz) = 76393 bytes
-SHA1 (patch-aa) = beef802678c5839fe37fa84288bb545934001ef2
+SHA1 (patch-aa) = 2e607af6ee2cd4a57091e4cce9ca799ca0fd5dcf
 SHA1 (patch-ab) = 63936898afa0cbf1c2e972d9aef9a6681de65f20
 SHA1 (patch-ac) = 42a1f77900e49f7e3afc9b3e935d66443b92ad69

Index: pkgsrc/filesystems/fuse-obexfs/patches/patch-aa
diff -u pkgsrc/filesystems/fuse-obexfs/patches/patch-aa:1.2 pkgsrc/filesystems/fuse-obexfs/patches/patch-aa:1.3
--- pkgsrc/filesystems/fuse-obexfs/patches/patch-aa:1.2 Wed May 16 11:02:12 2007
+++ pkgsrc/filesystems/fuse-obexfs/patches/patch-aa     Sat Jan 22 18:43:20 2022
@@ -1,16 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2007/05/16 11:02:12 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2022/01/22 18:43:20 pho Exp $
 
---- fuse/obexfs.c.orig 2006-01-19 15:46:43.000000000 +0100
-+++ fuse/obexfs.c      2007-05-16 12:52:58.000000000 +0200
-@@ -26,6 +26,8 @@
+* Use the correct API version: opendir() appeared on FUSE 2.3, not
+  2.2.
+
+* Work around an API incompatibility in the past versions of NetBSD
+  librefuse: it had a wrong prototype for the callback
+  statfs(). Already fixed in HEAD.
+
+--- fuse/obexfs.c.orig 2006-01-19 14:46:43.000000000 +0000
++++ fuse/obexfs.c
+@@ -26,8 +26,10 @@
  /* strndup */
  #define _GNU_SOURCE
  
+-/* at least fuse v 2.2 is needed */
+-#define FUSE_USE_VERSION 22
 +#include "config.h"
 +
- /* at least fuse v 2.2 is needed */
- #define FUSE_USE_VERSION 22
++/* at least fuse v 2.3 is needed */
++#define FUSE_USE_VERSION 23
  #include <fuse.h>
+ #include <stdio.h>
+ #include <stdlib.h>
 @@ -37,7 +39,11 @@
  #include <fcntl.h>
  #include <dirent.h>
@@ -31,11 +42,11 @@ $NetBSD: patch-aa,v 1.2 2007/05/16 11:02
  #ifdef DEBUGOUPUT
  #define DEBUG(...) fprintf(stderr, __VA_ARGS__)
  #else
-@@ -412,12 +417,20 @@
+@@ -412,12 +417,20 @@ static int ofs_release(const char *path,
        return 0;
  }
  
-+#if HAVE_SYS_STATVFS_H
++#if HAVE_SYS_STATVFS_H && defined(__NetBSD__) && FUSE_H_ < 20211204
 +static int ofs_statfs(const char *UNUSED(label), struct statvfs *st)
 +#else
  static int ofs_statfs(const char *UNUSED(label), struct statfs *st)
@@ -44,7 +55,7 @@ $NetBSD: patch-aa,v 1.2 2007/05/16 11:02
        int res;
        int size, free;
  
-+#if HAVE_SYS_STATVFS_H
++#if HAVE_SYS_STATVFS_H && defined(__NetBSD__) && FUSE_H_ < 20211204
 +      memset(st, 0, sizeof(struct statvfs));
 +#else
        memset(st, 0, sizeof(struct statfs));