diff --git a/srcpkgs/tailscale/patches/no-self-update.patch b/srcpkgs/tailscale/patches/no-self-update.patch index 11dddb923f8..3f37066ebc6 100644 --- a/srcpkgs/tailscale/patches/no-self-update.patch +++ b/srcpkgs/tailscale/patches/no-self-update.patch @@ -1,3 +1,6 @@ +don't let tailscale update itself manually or automatically, as users should do +that through XBPS at their choice. Also disable update check by default. + --- a/cmd/tailscale/cli/cli.go +++ b/cmd/tailscale/cli/cli.go @@ -130,7 +130,6 @@ @@ -8,3 +11,35 @@ }, FlagSet: rootfs, Exec: func(context.Context, []string) error { return flag.ErrHelp }, +--- a/cmd/tailscale/cli/set.go ++++ b/cmd/tailscale/cli/set.go +@@ -12,7 +12,6 @@ + "os/exec" + + "github.com/peterbourgon/ff/v3/ffcli" +- "tailscale.com/clientupdate" + "tailscale.com/ipn" + "tailscale.com/net/netutil" + "tailscale.com/net/tsaddr" +@@ -67,8 +67,7 @@ + setf.StringVar(&setArgs.hostname, "hostname", "", "hostname to use instead of the one provided by the OS") + setf.StringVar(&setArgs.advertiseRoutes, "advertise-routes", "", "routes to advertise to other nodes (comma-separated, e.g. \"10.0.0.0/8,192.168.0.0/24\") or empty string to not advertise routes") + setf.BoolVar(&setArgs.advertiseDefaultRoute, "advertise-exit-node", false, "offer to be an exit node for internet traffic for the tailnet") +- setf.BoolVar(&setArgs.updateCheck, "update-check", true, "notify about available Tailscale updates") +- setf.BoolVar(&setArgs.updateApply, "auto-update", false, "automatically update to the latest available version") ++ setf.BoolVar(&setArgs.updateCheck, "update-check", false, "notify about available Tailscale updates") + setf.BoolVar(&setArgs.postureChecking, "posture-checking", false, "HIDDEN: allow management plane to gather device posture information") + + if safesocket.GOOSUsesPeerCreds(goos) { +@@ -171,10 +170,7 @@ + return fmt.Errorf("failed to enable automatic updates: %v, %q", err, out) + } + } else { +- _, err := clientupdate.NewUpdater(clientupdate.Arguments{ForAutoUpdate: true}) +- if errors.Is(err, errors.ErrUnsupported) { +- return errors.New("automatic updates are not supported on this platform") +- } ++ return errors.New("automatic updates are not supported on this platform") + } + } + checkPrefs := curPrefs.Clone() diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template index 198e0d906ae..cb41c40ddb7 100644 --- a/srcpkgs/tailscale/template +++ b/srcpkgs/tailscale/template @@ -1,6 +1,6 @@ # Template file for 'tailscale' pkgname=tailscale -version=1.50.0 +version=1.52.0 revision=1 build_style=go go_import_path="tailscale.com" @@ -14,7 +14,7 @@ maintainer="Noel Cower " license="BSD-3-Clause" homepage="https://tailscale.com" distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz" -checksum=a7e024577854c07b793c4bbd81a497250e6a1b4536e303351a388810f13b7316 +checksum=8545b5121cb94bc84119b32623a6c513860f759ae96dcff8f404f81151999e06 post_install() { vlicense LICENSE