From 1bd3edbb46eb41d6a29d909ce788c978a935bb9c Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 7 Sep 2023 13:21:02 -0700 Subject: [PATCH] release/dist/unixpkgs: demote deb iptables+iproute2 packages to recommended Fixes #9236 Change-Id: Idbad2edb0262ef842afd6b40ae47f46e685b112d Signed-off-by: Brad Fitzpatrick --- release/dist/unixpkgs/pkgs.go | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/release/dist/unixpkgs/pkgs.go b/release/dist/unixpkgs/pkgs.go index 2efcf4a6f..8fb2c7ef3 100644 --- a/release/dist/unixpkgs/pkgs.go +++ b/release/dist/unixpkgs/pkgs.go @@ -250,10 +250,25 @@ func (t *debTarget) Build(b *dist.Build) ([]string, error) { PreRemove: filepath.Join(repoDir, "release/deb/debian.prerm.sh"), PostRemove: filepath.Join(repoDir, "release/deb/debian.postrm.sh"), }, - Depends: []string{"iptables", "iproute2"}, - Recommends: []string{"tailscale-archive-keyring (>= 1.35.181)"}, - Replaces: []string{"tailscale-relay"}, - Conflicts: []string{"tailscale-relay"}, + Depends: []string{}, + Recommends: []string{ + "tailscale-archive-keyring (>= 1.35.181)", + // iptables is often required but not strictly needed; see + // https://github.com/tailscale/tailscale/issues/9236. + // We want to let people be able to install without it + // or remove it after the fact if they want. + "iptables", + // The "ip" command isn't needed since 2021-11-01 in + // 408b0923a61972ed but kept as an option as of + // 2021-11-18 in d24ed3f68e35e802d531371. See + // https://github.com/tailscale/tailscale/issues/391. + // We keep it recommended because it's usually + // installed anyway and it's useful for debugging. But + // we can live without it, so it's not Depends. + "iproute2", + }, + Replaces: []string{"tailscale-relay"}, + Conflicts: []string{"tailscale-relay"}, }, }) pkg, err := nfpm.Get("deb")