CVS commit: pkgsrc/filesystems/fuse

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Sep  7 20:56:05 UTC 2023

Modified Files:
        pkgsrc/filesystems/fuse: Makefile PLIST.Linux distinfo
        pkgsrc/filesystems/fuse/patches: patch-util_Makefile.am
Removed Files:
        pkgsrc/filesystems/fuse/patches: patch-aa

Log Message:
filesystems/fuse: bring Linux build in par with current version.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/filesystems/fuse/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/filesystems/fuse/PLIST.Linux
cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/filesystems/fuse/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am

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/Makefile
diff -u pkgsrc/filesystems/fuse/Makefile:1.13 pkgsrc/filesystems/fuse/Makefile:1.14
--- pkgsrc/filesystems/fuse/Makefile:1.13       Thu Sep  7 19:38:14 2023
+++ pkgsrc/filesystems/fuse/Makefile    Thu Sep  7 20:56:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/09/07 19:38:14 vins Exp $
+# $NetBSD: Makefile,v 1.14 2023/09/07 20:56:05 vins Exp $
 #
 
 DISTNAME=      fuse-2.9.9
@@ -28,12 +28,25 @@ USE_LIBTOOL=        yes
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=       --with-pkgconfigdir=${PREFIX}/lib/pkgconfig
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+CONFIGURE_ENV+=        MOUNT_FUSE_PATH=${PREFIX}/sbin
+CONFIGURE_ENV+=        UDEV_RULES_PATH=${PREFIX}/${EGDIR}
+CONFIGURE_ENV+=        INIT_D_PATH=${PREFIX}/${EGDIR}
+.endif
+
 PKG_DOCS=      doc/how-fuse-works doc/kernel.txt
 DOCDIR=                share/doc/${PKGBASE}
+EGDIR=         share/examples/${PKGBASE}
 
 INSTALL_TARGET=                install-strip
 INSTALLATION_DIRS+=    ${DOCDIR}
 
+.if ${OPSYS} == "Linux"
+INSTALLATION_DIRS+=    sbin ${EGDIR}
+.endif
+
 WRKSRC=        ${WRKDIR}/libfuse-${DISTNAME}
 
 pre-configure:
@@ -47,6 +60,10 @@ post-install:
        ${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|}     \
                ${DESTDIR}${PREFIX}/${DOCDIR}
 
+.if ${OPSYS} == "Linux"
+       ${RUN}${CHMOD} -w       ${DESTDIR}${PREFIX}/bin/fusermount
+.endif
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 .include "../../filesystems/perfuse/buildlink3.mk"

Index: pkgsrc/filesystems/fuse/PLIST.Linux
diff -u pkgsrc/filesystems/fuse/PLIST.Linux:1.3 pkgsrc/filesystems/fuse/PLIST.Linux:1.4
--- pkgsrc/filesystems/fuse/PLIST.Linux:1.3     Thu Sep  7 19:38:14 2023
+++ pkgsrc/filesystems/fuse/PLIST.Linux Thu Sep  7 20:56:05 2023
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2023/09/07 19:38:14 vins Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2023/09/07 20:56:05 vins Exp $
 bin/fusermount
 bin/ulockmgr_server
 man/man1/fusermount.1
 man/man1/ulockmgr_server.1
 man/man8/mount.fuse.8
+sbin/mount.fuse
+share/examples/fuse/99-fuse.rules
+share/examples/fuse/init.d.fuse

Index: pkgsrc/filesystems/fuse/distinfo
diff -u pkgsrc/filesystems/fuse/distinfo:1.8 pkgsrc/filesystems/fuse/distinfo:1.9
--- pkgsrc/filesystems/fuse/distinfo:1.8        Thu Sep  7 19:38:14 2023
+++ pkgsrc/filesystems/fuse/distinfo    Thu Sep  7 20:56:05 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2023/09/07 19:38:14 vins Exp $
+$NetBSD: distinfo,v 1.9 2023/09/07 20:56:05 vins Exp $
 
 BLAKE2s (fuse-2.9.9.tar.gz) = 5b851aa97441a9e13a4718a0775e01cbfff8020d7f4a0656adfca439f8d42d95
 SHA512 (fuse-2.9.9.tar.gz) = 1acd51a647ec3dbf9eaafb80cec92bd8542bcbb2cf4510fc8b079b4f8aaa8f4b301e469ddefe4f1cc4ae2bf941e028077601c20d97f187cc618cea8710cbe331
@@ -6,5 +6,5 @@ Size (fuse-2.9.9.tar.gz) = 212017 bytes
 SHA1 (patch-configure.ac) = 1e8d0081c8dc48e126d1cde856178c39f358ee37
 SHA1 (patch-doc_Makefile.am) = ffe16fc87e03772ca2e1124549177e999806dbd9
 SHA1 (patch-lib_mount__bsd.c) = 6b00d0950e0146321a575a2f90c83d8aa7d3cc07
-SHA1 (patch-util_Makefile.am) = 9c1361a489203dc7a7cd09289b2a15189a82c030
+SHA1 (patch-util_Makefile.am) = b3c79ad1e7390ba313476efb5ba3b67a214a8006
 SHA1 (patch-util_ulockmgr__server.c) = 2ec86dc8eca5e24952738171eb0937d822b8c657

Index: pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am
diff -u pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am:1.1 pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am:1.2
--- pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am:1.1  Thu Sep  7 19:38:15 2023
+++ pkgsrc/filesystems/fuse/patches/patch-util_Makefile.am      Thu Sep  7 20:56:05 2023
@@ -1,15 +1,16 @@
-$NetBSD: patch-util_Makefile.am,v 1.1 2023/09/07 19:38:15 vins Exp $
+$NetBSD: patch-util_Makefile.am,v 1.2 2023/09/07 20:56:05 vins Exp $
 
-mount.fuse is a script, not a binary.
+Rename the init.d fuse script before installing it 
+in the example directory. 
 
 --- util/Makefile.am.orig      2019-01-04 13:38:34.000000000 +0000
 +++ util/Makefile.am
-@@ -36,7 +36,7 @@ INIT_D_PATH = @INIT_D_PATH@
- 
- install-exec-local:
+@@ -38,7 +38,7 @@ install-exec-local:
        $(MKDIR_P) $(DESTDIR)$(MOUNT_FUSE_PATH)
--      $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
-+      $(INSTALL_SCRIPT) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+       $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
        $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH)
-       $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+-      $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
++      $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/init.d.fuse
        @if test -x /usr/sbin/update-rc.d; then \
+               echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+               /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \