From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: UPDATE: net/tailscale-1.92.2
To: Greg Steuck <gnezdo@openbsd.org>
Cc: Daniel Jakots <danj@chown.me>, Adriano Barbosa <barbosa.aob@gmail.com>, ports@openbsd.org
Date: Mon, 22 Dec 2025 12:58:15 +0000

On 2025/12/21 20:55, Greg Steuck wrote:
> Daniel Jakots <danj@chown.me> writes:
> 
> >> Update for net/tailscale v1.92.2
> >> Changelog:
> >> https://tailscale.com/changelog
> >
> > Committed, thanks!
> 
> If somebody wants to add this openbsd-specific fix to the port while
> it's pending upstream, I'll be a happier user:
> 
> https://github.com/tailscale/tailscale/pull/18205/changes/b39cd8404be30ae4306ee33b00a1b6f511aff96b
> 
> I'm not fluent enough in Go ports to do this myself.
> 

see diff below is how (the port already has WRKDIST = ${WRKSRC} left
over from previous patching, so you need to start building, then ^C,
then things are in the right place for patching as normal).

could you test/commit if it works please?


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/tailscale/Makefile,v
diff -u -p -r1.62 Makefile
--- Makefile	14 Dec 2025 02:43:45 -0000	1.62
+++ Makefile	22 Dec 2025 12:56:09 -0000
@@ -3,6 +3,7 @@ BROKEN-i386 =	unix.EPROTO not defined
 COMMENT =	modern overlay-like VPN built on top of WireGuard
 
 V =		1.92.2
+REVISION =	0
 MODGO_MODNAME =	tailscale.com
 MODGO_VERSION =	v${V}
 
Index: patches/patch-net_dns_manager_go
===================================================================
RCS file: patches/patch-net_dns_manager_go
diff -N patches/patch-net_dns_manager_go
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-net_dns_manager_go	22 Dec 2025 12:56:09 -0000
@@ -0,0 +1,21 @@
+https://github.com/tailscale/tailscale/pull/18205
+
+Index: net/dns/manager.go
+--- net/dns/manager.go.orig
++++ net/dns/manager.go
+@@ -400,7 +400,14 @@ func (m *Manager) compileConfig(cfg Config) (rcfg reso
+ 			defaultRoutes = append(defaultRoutes, &dnstype.Resolver{Addr: ip.String()})
+ 		}
+ 		rcfg.Routes["."] = defaultRoutes
+-		ocfg.SearchDomains = append(ocfg.SearchDomains, baseCfg.SearchDomains...)
++		// Append base config search domains, but only if not already present.
++		// This prevents duplicates when GetBaseConfig() reads back domains that
++		// Tailscale itself previously wrote to resolv.conf.
++		for _, domain := range baseCfg.SearchDomains {
++			if !slices.Contains(ocfg.SearchDomains, domain) {
++				ocfg.SearchDomains = append(ocfg.SearchDomains, domain)
++			}
++		}
+ 	}
+ 
+ 	return rcfg, ocfg, nil