From bbbfa3b65046bb6be028936863c7d3e1a9ad164c Mon Sep 17 00:00:00 2001 From: kayrus Date: Fri, 30 Jul 2021 13:13:12 +0200 Subject: [PATCH] Fix compilation with golang 1.13 Fixes #34 --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/kayrus/tuncfg/resolv/resolv.go | 3 +-- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 38e9d43..4aeca76 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/fatih/color v1.10.0 github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c github.com/hpcloud/tail v1.0.0 - github.com/kayrus/tuncfg v0.0.0-20210314181855-c4c275404a9a + github.com/kayrus/tuncfg v0.0.0-20210730110630-36a04c3b2644 github.com/manifoldco/promptui v0.8.0 github.com/miekg/dns v1.1.40 github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index 72fd4c6..f6f06f2 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= -github.com/kayrus/tuncfg v0.0.0-20210314181855-c4c275404a9a h1:BcTyugw4H9VffOSwSp+2jz6BfuH/UXD8ZZO13tZBkBc= -github.com/kayrus/tuncfg v0.0.0-20210314181855-c4c275404a9a/go.mod h1:jdUyRmw1/BT20zlom8+Fiuv56uiT7vVy0y40CRESYU4= +github.com/kayrus/tuncfg v0.0.0-20210730110630-36a04c3b2644 h1:2+NDGym+CYxxEqWB7smcfg5be6reITG0bboKFAbjJl0= +github.com/kayrus/tuncfg v0.0.0-20210730110630-36a04c3b2644/go.mod h1:jdUyRmw1/BT20zlom8+Fiuv56uiT7vVy0y40CRESYU4= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= diff --git a/vendor/github.com/kayrus/tuncfg/resolv/resolv.go b/vendor/github.com/kayrus/tuncfg/resolv/resolv.go index e0f4fd8..4dde82d 100644 --- a/vendor/github.com/kayrus/tuncfg/resolv/resolv.go +++ b/vendor/github.com/kayrus/tuncfg/resolv/resolv.go @@ -3,7 +3,6 @@ package resolv import ( "bufio" "bytes" - "io/fs" "io/ioutil" "net" "os" @@ -51,7 +50,7 @@ type Handler struct { backup []byte backupFilename string - mode fs.FileMode + mode os.FileMode } func New(name string, dnsServers []net.IP, dnsSuffixes []string, rewrite bool) (*Handler, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index a232e9c..a483354 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -21,7 +21,7 @@ github.com/hpcloud/tail/winfile # github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a github.com/juju/ansiterm github.com/juju/ansiterm/tabwriter -# github.com/kayrus/tuncfg v0.0.0-20210314181855-c4c275404a9a +# github.com/kayrus/tuncfg v0.0.0-20210730110630-36a04c3b2644 ## explicit github.com/kayrus/tuncfg/log github.com/kayrus/tuncfg/resolv