From 69d88505fd7f4cb0d9e4f1918de296342fe05858 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 23 Aug 2021 15:05:15 +0200
Subject: go mod: declare module version v2

Our git version is v2+ for some time now, but go.mod
still declared v1. Hopefully making both match makes
https://pkg.go.dev/github.com/rfjakob/gocryptfs/v2 work.

All the import paths have been fixed like this:

  find . -name \*.go | xargs sed -i s%github.com/rfjakob/gocryptfs/%github.com/rfjakob/gocryptfs/v2/%
---
 internal/configfile/config_file.go | 14 +++++++-------
 internal/configfile/config_test.go |  2 +-
 internal/configfile/scrypt.go      |  6 +++---
 internal/configfile/scrypt_test.go |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'internal/configfile')

diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index 025e1c3..d457db6 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -12,10 +12,10 @@ import (
 
 	"os"
 
-	"github.com/rfjakob/gocryptfs/internal/contentenc"
-	"github.com/rfjakob/gocryptfs/internal/cryptocore"
-	"github.com/rfjakob/gocryptfs/internal/exitcodes"
-	"github.com/rfjakob/gocryptfs/internal/tlog"
+	"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+	"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+	"github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+	"github.com/rfjakob/gocryptfs/v2/internal/tlog"
 )
 
 const (
@@ -223,10 +223,10 @@ func Load(filename string) (*ConfFile, error) {
     The filesystem was created by gocryptfs v0.6 or earlier. This version of
     gocryptfs can no longer mount the filesystem.
     Please download gocryptfs v0.11 and upgrade your filesystem,
-    see https://github.com/rfjakob/gocryptfs/wiki/Upgrading for instructions.
+    see https://github.com/rfjakob/gocryptfs/v2/wiki/Upgrading for instructions.
 
     If you have trouble upgrading, join the discussion at
-    https://github.com/rfjakob/gocryptfs/issues/29 .
+    https://github.com/rfjakob/gocryptfs/v2/issues/29 .
 
 `+tlog.ColorReset)
 
@@ -312,7 +312,7 @@ func (cf *ConfFile) WriteFile() error {
 	err = fd.Sync()
 	if err != nil {
 		// This can happen on network drives: FRITZ.NAS mounted on MacOS returns
-		// "operation not supported": https://github.com/rfjakob/gocryptfs/issues/390
+		// "operation not supported": https://github.com/rfjakob/gocryptfs/v2/issues/390
 		tlog.Warn.Printf("Warning: fsync failed: %v", err)
 		// Try sync instead
 		syscall.Sync()
diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go
index c03be90..6986888 100644
--- a/internal/configfile/config_test.go
+++ b/internal/configfile/config_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rfjakob/gocryptfs/internal/tlog"
+	"github.com/rfjakob/gocryptfs/v2/internal/tlog"
 )
 
 var testPw = []byte("test")
diff --git a/internal/configfile/scrypt.go b/internal/configfile/scrypt.go
index 54fe0c6..7ac822e 100644
--- a/internal/configfile/scrypt.go
+++ b/internal/configfile/scrypt.go
@@ -7,9 +7,9 @@ import (
 
 	"golang.org/x/crypto/scrypt"
 
-	"github.com/rfjakob/gocryptfs/internal/cryptocore"
-	"github.com/rfjakob/gocryptfs/internal/exitcodes"
-	"github.com/rfjakob/gocryptfs/internal/tlog"
+	"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+	"github.com/rfjakob/gocryptfs/v2/internal/exitcodes"
+	"github.com/rfjakob/gocryptfs/v2/internal/tlog"
 )
 
 const (
diff --git a/internal/configfile/scrypt_test.go b/internal/configfile/scrypt_test.go
index 8f7a5c8..30f37a1 100644
--- a/internal/configfile/scrypt_test.go
+++ b/internal/configfile/scrypt_test.go
@@ -17,7 +17,7 @@ BenchmarkScrypt14-2	      20	  92561590 ns/op ... 92ms
 BenchmarkScrypt15-2	      10	 183971593 ns/op
 BenchmarkScrypt16-2	       3	 368506365 ns/op
 BenchmarkScrypt17-2	       2	 755502608 ns/op ... 755ms
-ok  	github.com/rfjakob/gocryptfs/cryptfs	18.772s
+ok  	github.com/rfjakob/gocryptfs/v2/cryptfs	18.772s
 */
 
 func benchmarkScryptN(n int, b *testing.B) {
-- 
cgit v1.2.3