From 49c9f409b109ff6c4be9aa1c14a84c84eda67d05 Mon Sep 17 00:00:00 2001
From: Dale Hui <dhui@users.noreply.github.com>
Date: Thu, 16 Apr 2020 14:42:55 -0700
Subject: [PATCH] Update packages

- Use built-in context package insteaed of golang.org/x/net/context
- Use bbolt instead of old boltdb
---
 dir.go        |  4 ++--
 file.go       |  4 ++--
 fs.go         |  2 +-
 go.mod        |  6 +++---
 go.sum        | 18 ++++++++----------
 mount.go      |  2 +-
 mount_test.go |  2 +-
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/dir.go b/dir.go
index 3c6f8d4..afc5d03 100644
--- a/dir.go
+++ b/dir.go
@@ -1,13 +1,13 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"os"
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	"github.com/boltdb/bolt"
-	"golang.org/x/net/context"
+	bolt "go.etcd.io/bbolt"
 )
 
 type Dir struct {
diff --git a/file.go b/file.go
index 15970b7..2140cc5 100644
--- a/file.go
+++ b/file.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"sync"
 	"syscall"
@@ -8,8 +9,7 @@ import (
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
 	"bazil.org/fuse/fuseutil"
-	"github.com/boltdb/bolt"
-	"golang.org/x/net/context"
+	bolt "go.etcd.io/bbolt"
 )
 
 type File struct {
diff --git a/fs.go b/fs.go
index 29e2aed..76fc393 100644
--- a/fs.go
+++ b/fs.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"bazil.org/fuse/fs"
-	"github.com/boltdb/bolt"
+	bolt "go.etcd.io/bbolt"
 )
 
 type FS struct {
diff --git a/go.mod b/go.mod
index 4dd8a56..e01dda4 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module bazil.org/bolt-mount
 go 1.13
 
 require (
-	bazil.org/fuse v0.0.0-20191221031930-2713cb0db94b
-	github.com/boltdb/bolt v1.3.1
-	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	bazil.org/fuse v0.0.0-20200416020106-1af1d1f56f46
+	go.etcd.io/bbolt v1.3.4
+	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
 )
diff --git a/go.sum b/go.sum
index 63a0ae3..5a9f62f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,12 @@
-bazil.org/fuse v0.0.0-20191221031930-2713cb0db94b h1:/XFU3ufWdGEfQCKvQBzyhhOpf7KdFHbEyRXA8fHSbZY=
-bazil.org/fuse v0.0.0-20191221031930-2713cb0db94b/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+bazil.org/fuse v0.0.0-20200416020106-1af1d1f56f46 h1:ox1mVHIEzbuEzYwcrE+fM7ENuwFY4rcbYK6e4IJNlkA=
+bazil.org/fuse v0.0.0-20200416020106-1af1d1f56f46/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c h1:u6SKchux2yDvFQnDHS3lPnIRmfVJ5Sxy3ao2SIdysLQ=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
+go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 h1:gSbV7h1NRL2G1xTg/owz62CST1oJBmxy4QpMMregXVQ=
 golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 h1:opSr2sbRXk5X5/givKrrKj9HXxFpW2sdCiP8MJSKLQY=
+golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/mount.go b/mount.go
index 5e438b3..8b563a4 100644
--- a/mount.go
+++ b/mount.go
@@ -3,7 +3,7 @@ package main
 import (
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
-	"github.com/boltdb/bolt"
+	bolt "go.etcd.io/bbolt"
 )
 
 func mount(dbpath, mountpoint string) error {
diff --git a/mount_test.go b/mount_test.go
index 690f2e3..5f17797 100644
--- a/mount_test.go
+++ b/mount_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"bazil.org/fuse/fs/fstestutil"
-	"github.com/boltdb/bolt"
+	bolt "go.etcd.io/bbolt"
 )
 
 func withDB(t testing.TB, fn func(*bolt.DB)) {