From 7fffddce8e15bea420d10839666c6e544ef6ed1e Mon Sep 17 00:00:00 2001
From: Denton Gentry <dgentry@tailscale.com>
Date: Wed, 8 Jun 2022 17:14:37 -0700
Subject: [PATCH] net/portmapper: enable for iOS

In the 1.27 unstable releases we set the min-version to iOS15,
which means we have 50 MBytes of RAM in the Network Extension.
https://tailscale.com/blog/go-linker/

Include the UPnP/NAT-PMP/PCP portmapper support now that there
is memory for it.

Fixes https://github.com/tailscale/tailscale/issues/2495
Signed-off-by: Denton Gentry <dgentry@tailscale.com>
---
 net/portmapper/disabled_stubs.go | 6 ++----
 net/portmapper/upnp.go           | 7 +++----
 tstest/iosdeps/iosdeps_test.go   | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/net/portmapper/disabled_stubs.go b/net/portmapper/disabled_stubs.go
index d940f3de0..4a288473d 100644
--- a/net/portmapper/disabled_stubs.go
+++ b/net/portmapper/disabled_stubs.go
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build ios || js
-// +build ios js
-
-// (https://github.com/tailscale/tailscale/issues/2495)
+//go:build js
+// +build js
 
 package portmapper
 
diff --git a/net/portmapper/upnp.go b/net/portmapper/upnp.go
index c886ee344..cc7782736 100644
--- a/net/portmapper/upnp.go
+++ b/net/portmapper/upnp.go
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !ios && !js
-// +build !ios,!js
-
-// (https://github.com/tailscale/tailscale/issues/2495)
+//go:build !js
+// +build !js
+// (no raw sockets in JS/WASM)
 
 package portmapper
 
diff --git a/tstest/iosdeps/iosdeps_test.go b/tstest/iosdeps/iosdeps_test.go
index 7a3bc0cf3..afb33cdaa 100644
--- a/tstest/iosdeps/iosdeps_test.go
+++ b/tstest/iosdeps/iosdeps_test.go
@@ -34,7 +34,7 @@ func TestDeps(t *testing.T) {
 	}
 	for _, dep := range res.Deps {
 		switch dep {
-		case "regexp", "regexp/syntax", "text/template", "html/template":
+		case "text/template", "html/template":
 			t.Errorf("package %q is not allowed as a dependency on iOS", dep)
 		}
 	}