diff options
| author | Jakob Unterwurzacher | 2020-05-17 14:18:23 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2020-05-17 14:23:47 +0200 |
| commit | ec74d1d2f4217a9a337d1db9902f32ae2aecaf33 (patch) | |
| tree | 7eb2d57f68996bd10256e8bf79292b1815e2a545 | |
| parent | ead7008a08f9ace4591ebbc03e63fdc7ef37e502 (diff) | |
Update go-fuse import path to github.com/hanwen/go-fuse/v2
We need
https://github.com/hanwen/go-fuse/commit/fd7328faf9fdf75709f7ba7df7072aaf4eeb18b3
to fix a crash reported in https://github.com/rfjakob/gocryptfs/issues/430 :
2019/10/30 17:14:16 Unknown opcode 2016
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x20 pc=0x508d38]
This patch is only in the v2.x.x branch. Upgrade to v2, as the
old API is also supported there.
Running
git grep hanwen/go-fuse | grep -v hanwen/go-fuse/v2
to check for forgotten references comes back clean.
24 files changed, 36 insertions, 35 deletions
@@ -42,7 +42,7 @@ if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then else # go-fuse version according to Go Modules FAIL=0 - OUT=$(go list -m github.com/hanwen/go-fuse | cut -d' ' -f2) || FAIL=1 + OUT=$(go list -m github.com/hanwen/go-fuse/v2 | cut -d' ' -f2) || FAIL=1 if [[ $FAIL -eq 0 ]]; then GITVERSIONFUSE=$OUT else diff --git a/cli_args.go b/cli_args.go index bc66d30..e5eebf8 100644 --- a/cli_args.go +++ b/cli_args.go @@ -14,7 +14,8 @@ import ( "strings" "time" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/exitcodes" "github.com/rfjakob/gocryptfs/internal/stupidgcm" @@ -10,8 +10,8 @@ import ( "sync" "syscall" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/exitcodes" "github.com/rfjakob/gocryptfs/internal/fusefrontend" diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go index 697026a..efdec9f 100644 --- a/internal/contentenc/content.go +++ b/internal/contentenc/content.go @@ -10,7 +10,7 @@ import ( "runtime" "sync" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/cryptocore" "github.com/rfjakob/gocryptfs/internal/stupidgcm" diff --git a/internal/fusefrontend/args.go b/internal/fusefrontend/args.go index e767f28..646d6c4 100644 --- a/internal/fusefrontend/args.go +++ b/internal/fusefrontend/args.go @@ -1,7 +1,7 @@ package fusefrontend import ( - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) // Args is a container for arguments that are passed from main() to fusefrontend diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go index 8c2bae0..2e03aa7 100644 --- a/internal/fusefrontend/file.go +++ b/internal/fusefrontend/file.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/contentenc" "github.com/rfjakob/gocryptfs/internal/inomap" diff --git a/internal/fusefrontend/file_allocate_truncate.go b/internal/fusefrontend/file_allocate_truncate.go index b75462d..b6e9150 100644 --- a/internal/fusefrontend/file_allocate_truncate.go +++ b/internal/fusefrontend/file_allocate_truncate.go @@ -8,7 +8,7 @@ import ( "sync" "syscall" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/syscallcompat" "github.com/rfjakob/gocryptfs/internal/tlog" diff --git a/internal/fusefrontend/file_holes.go b/internal/fusefrontend/file_holes.go index c9f7aa6..2b7564e 100644 --- a/internal/fusefrontend/file_holes.go +++ b/internal/fusefrontend/file_holes.go @@ -6,7 +6,7 @@ import ( "runtime" "syscall" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) diff --git a/internal/fusefrontend/fs.go b/internal/fusefrontend/fs.go index dbd8236..e8dae9f 100644 --- a/internal/fusefrontend/fs.go +++ b/internal/fusefrontend/fs.go @@ -12,9 +12,9 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" - "github.com/hanwen/go-fuse/fuse/pathfs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse/pathfs" "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/contentenc" diff --git a/internal/fusefrontend/fs_dir.go b/internal/fusefrontend/fs_dir.go index 151af6a..98986fe 100644 --- a/internal/fusefrontend/fs_dir.go +++ b/internal/fusefrontend/fs_dir.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/cryptocore" diff --git a/internal/fusefrontend/xattr.go b/internal/fusefrontend/xattr.go index 96a0372..d55de3e 100644 --- a/internal/fusefrontend/xattr.go +++ b/internal/fusefrontend/xattr.go @@ -5,7 +5,7 @@ import ( "strings" "syscall" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) diff --git a/internal/fusefrontend/xattr_darwin.go b/internal/fusefrontend/xattr_darwin.go index b690cc0..1d4ffcd 100644 --- a/internal/fusefrontend/xattr_darwin.go +++ b/internal/fusefrontend/xattr_darwin.go @@ -8,7 +8,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/syscallcompat" ) diff --git a/internal/fusefrontend/xattr_linux.go b/internal/fusefrontend/xattr_linux.go index b43dfee..a4d2710 100644 --- a/internal/fusefrontend/xattr_linux.go +++ b/internal/fusefrontend/xattr_linux.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/syscallcompat" ) diff --git a/internal/fusefrontend_reverse/reverse_longnames.go b/internal/fusefrontend_reverse/reverse_longnames.go index 199356b..f1576d2 100644 --- a/internal/fusefrontend_reverse/reverse_longnames.go +++ b/internal/fusefrontend_reverse/reverse_longnames.go @@ -9,8 +9,8 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/nametransform" "github.com/rfjakob/gocryptfs/internal/pathiv" diff --git a/internal/fusefrontend_reverse/rfile.go b/internal/fusefrontend_reverse/rfile.go index 9c31681..68f7309 100644 --- a/internal/fusefrontend_reverse/rfile.go +++ b/internal/fusefrontend_reverse/rfile.go @@ -10,8 +10,8 @@ import ( // In newer Go versions, this has moved to just "sync/syncmap". "golang.org/x/sync/syncmap" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/contentenc" "github.com/rfjakob/gocryptfs/internal/pathiv" diff --git a/internal/fusefrontend_reverse/rfs.go b/internal/fusefrontend_reverse/rfs.go index 8c7ce02..aade5c7 100644 --- a/internal/fusefrontend_reverse/rfs.go +++ b/internal/fusefrontend_reverse/rfs.go @@ -7,9 +7,9 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" - "github.com/hanwen/go-fuse/fuse/pathfs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse/pathfs" "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/contentenc" diff --git a/internal/fusefrontend_reverse/virtualfile.go b/internal/fusefrontend_reverse/virtualfile.go index 7d1c18c..f258e7f 100644 --- a/internal/fusefrontend_reverse/virtualfile.go +++ b/internal/fusefrontend_reverse/virtualfile.go @@ -7,8 +7,8 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" "github.com/rfjakob/gocryptfs/internal/inomap" "github.com/rfjakob/gocryptfs/internal/nametransform" diff --git a/internal/syscallcompat/getdents_linux.go b/internal/syscallcompat/getdents_linux.go index 3853f2d..2674cb3 100644 --- a/internal/syscallcompat/getdents_linux.go +++ b/internal/syscallcompat/getdents_linux.go @@ -14,7 +14,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) diff --git a/internal/syscallcompat/getdents_other.go b/internal/syscallcompat/getdents_other.go index 6d08a9b..82932db 100644 --- a/internal/syscallcompat/getdents_other.go +++ b/internal/syscallcompat/getdents_other.go @@ -6,7 +6,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) // emulateGetdents reads all directory entries from the open directory "fd" diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go index bfcc50a..cb95b7c 100644 --- a/internal/syscallcompat/getdents_test.go +++ b/internal/syscallcompat/getdents_test.go @@ -12,7 +12,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) var emulate = false diff --git a/internal/syscallcompat/sys_darwin.go b/internal/syscallcompat/sys_darwin.go index 699e38c..d9e6017 100644 --- a/internal/syscallcompat/sys_darwin.go +++ b/internal/syscallcompat/sys_darwin.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) const ( diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go index ac7891a..e2b19bb 100644 --- a/internal/syscallcompat/sys_linux.go +++ b/internal/syscallcompat/sys_linux.go @@ -13,7 +13,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/contentenc" @@ -22,9 +22,9 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" - "github.com/hanwen/go-fuse/fuse/nodefs" - "github.com/hanwen/go-fuse/fuse/pathfs" + "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v2/fuse/nodefs" + "github.com/hanwen/go-fuse/v2/fuse/pathfs" "github.com/rfjakob/gocryptfs/internal/configfile" "github.com/rfjakob/gocryptfs/internal/contentenc" |