git: c6701d7260fd - 2022Q3 - net/rclone: Fix /dev/fuse polling issue
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Aug 2022 13:08:50 UTC
The branch 2022Q3 has been updated by dmgk:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c6701d7260fdbbe1420c554e5a98c92caefbacd3
commit c6701d7260fdbbe1420c554e5a98c92caefbacd3
Author: Dmitri Goutnik <dmgk@FreeBSD.org>
AuthorDate: 2022-08-22 12:56:39 +0000
Commit: Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2022-08-22 12:58:27 +0000
net/rclone: Fix /dev/fuse polling issue
Apply bazil/fuse workaround from [1], bump PORTREVISION.
[1] https://github.com/golang/go/issues/54100#issuecomment-1200165500
PR: 258056
Approved by: Ralf van der Enden <tremere@cainites.net> (maintainer)
---
net/rclone/Makefile | 2 +-
.../files/patch-vendor_bazil.org_fuse_mount__freebsd.go | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 145636911b65..72a6f57de96c 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -1,7 +1,7 @@
PORTNAME= rclone
DISTVERSIONPREFIX= v
DISTVERSION= 1.58.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= tremere@cainites.net
diff --git a/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go b/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go
new file mode 100644
index 000000000000..6e65abfd799a
--- /dev/null
+++ b/net/rclone/files/patch-vendor_bazil.org_fuse_mount__freebsd.go
@@ -0,0 +1,15 @@
+--- vendor/bazil.org/fuse/mount_freebsd.go.orig 2022-08-09 15:43:51 UTC
++++ vendor/bazil.org/fuse/mount_freebsd.go
+@@ -56,10 +56,11 @@ func mount(dir string, conf *mountConfig) (*os.File, e
+ }
+ }
+
+- f, err := os.OpenFile("/dev/fuse", os.O_RDWR, 0o000)
++ fd, err := syscall.Open("/dev/fuse", os.O_RDWR|syscall.O_CLOEXEC, 0o000)
+ if err != nil {
+ return nil, err
+ }
++ f := os.NewFile(uintptr(fd), "/dev/fuse")
+
+ cmd := exec.Command(
+ "/sbin/mount_fusefs",