From 26e72f15efe798eb1a4c7acf082eb97e243b6644 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Wed, 26 Oct 2022 16:18:53 -0700 Subject: [PATCH] go.mod: update from OSS. Signed-off-by: Denton Gentry --- android/build.gradle | 2 +- cmd/tailscale/main.go | 4 ++-- go.mod | 2 +- go.sum | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 4504704..485155b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,7 +26,7 @@ android { defaultConfig { minSdkVersion 22 targetSdkVersion 31 - versionCode 133 + versionCode 134 versionName "1.33.21-t63ad49890-g80dfbd8a0c5" } compileOptions { diff --git a/cmd/tailscale/main.go b/cmd/tailscale/main.go index 4d18283..6307d62 100644 --- a/cmd/tailscale/main.go +++ b/cmd/tailscale/main.go @@ -349,9 +349,9 @@ func (a *App) runBackend() error { configErrs <- b.updateTUN(service, cfg.rcfg, cfg.dcfg) case n := <-notifications: exitWasOnline := state.ExitStatus == ExitOnline - if p := n.Prefs; p != nil { + if p := n.Prefs; n.Prefs.Valid() { first := state.Prefs == nil - state.Prefs = p.Clone() + state.Prefs = p.AsStruct() state.updateExitNodes() if first { state.Prefs.Hostname = a.hostname() diff --git a/go.mod b/go.mod index a14bbd6..0d2d1cb 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 golang.zx2c4.com/wireguard v0.0.0-20220904105730-b51010ba13f0 inet.af/netaddr v0.0.0-20220617031823-097006376321 - tailscale.com v1.1.1-0.20221014220806-63ad49890f63 + tailscale.com v1.1.1-0.20221027232652-81fd259133f5 ) require ( diff --git a/go.sum b/go.sum index 04986ed..271a104 100644 --- a/go.sum +++ b/go.sum @@ -678,7 +678,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -honnef.co/go/tools v0.4.0-0.dev.0.20220404092545-59d7a2877f83 h1:lZ9GIYaU+o5+X6ST702I/Ntyq9Y2oIMZ42rBQpem64A= +honnef.co/go/tools v0.4.0-0.dev.0.20220517111757-f4a2f64ce238 h1:8Vr1KP9OTjoKQSSeLefzibQgDV4s2ujJElKHqMi7nsA= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= inet.af/netaddr v0.0.0-20220617031823-097006376321 h1:B4dC8ySKTQXasnjDTMsoCMf1sQG4WsMej0WXaHxunmU= inet.af/netaddr v0.0.0-20220617031823-097006376321/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k= @@ -687,5 +687,5 @@ nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 h1:SqYE5+A2qvRhErbsXFfUEUmpWEKxxRSMgGLkvRAFOV4= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -tailscale.com v1.1.1-0.20221014220806-63ad49890f63 h1:2gFWWY53Gjgrul7UIbKjS5IecMOLLTd0sKdbWN4MPT4= -tailscale.com v1.1.1-0.20221014220806-63ad49890f63/go.mod h1:Y53dMo7XUIYScorwqsmc6ISTlXJY35PiTTmkIBDx99M= +tailscale.com v1.1.1-0.20221027232652-81fd259133f5 h1:7XpTuAXL/fsuyhrImBSCxGX3UsYyAPu5XmGLBxHa6fs= +tailscale.com v1.1.1-0.20221027232652-81fd259133f5/go.mod h1:Ft+SaK8wkLg+ggwsbdaZY9iXMbQ4NXuGzAquiVlZ3sA=