From fb420be1769426c96af8a5e58adcf6562e3d51a7 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 9 Oct 2024 17:55:42 -0700 Subject: [PATCH] safesocket: don't depend on go-ps on iOS There's never a tailscaled on iOS. And we can't run child processes to look for it anyway. Updates tailscale/corp#20099 Change-Id: Ieb3776f4bb440c4f1c442fdd169bacbe17f23ddb Signed-off-by: Brad Fitzpatrick --- safesocket/safesocket_ps.go | 2 +- tstest/iosdeps/iosdeps_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/safesocket/safesocket_ps.go b/safesocket/safesocket_ps.go index f7d97f7fd..18197846d 100644 --- a/safesocket/safesocket_ps.go +++ b/safesocket/safesocket_ps.go @@ -1,7 +1,7 @@ // Copyright (c) Tailscale Inc & AUTHORS // SPDX-License-Identifier: BSD-3-Clause -//go:build linux || windows || darwin || freebsd +//go:build linux || windows || (darwin && !ios) || freebsd package safesocket diff --git a/tstest/iosdeps/iosdeps_test.go b/tstest/iosdeps/iosdeps_test.go index 273872a64..40e084c21 100644 --- a/tstest/iosdeps/iosdeps_test.go +++ b/tstest/iosdeps/iosdeps_test.go @@ -19,6 +19,7 @@ func TestDeps(t *testing.T) { "html/template": "linker bloat (MethodByName)", "tailscale.com/net/wsconn": "https://github.com/tailscale/tailscale/issues/13762", "github.com/coder/websocket": "https://github.com/tailscale/tailscale/issues/13762", + "github.com/mitchellh/go-ps": "https://github.com/tailscale/tailscale/pull/13759", }, }.Check(t) }