From 0894e11c2ab0b51231c6feb0ec7574e7436a7974 Mon Sep 17 00:00:00 2001
From: Interloper <45214659+0xdeb7ef@users.noreply.github.com>
Date: Sun, 22 Mar 2026 13:49:55 -0700
Subject: [PATCH 1/2] `tailscale`: add support for tun module

---
 packages/tailscale/VELBUILD | 39 ++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/tailscale/VELBUILD b/packages/tailscale/VELBUILD
index 8faf412f..a937efd1 100644
--- a/packages/tailscale/VELBUILD
+++ b/packages/tailscale/VELBUILD
@@ -1,7 +1,7 @@
 maintainer="Interloper <45214659+0xdeb7ef@users.noreply.github.com>"
 pkgname=tailscale
 pkgver=1.96.2
-pkgrel=0
+pkgrel=1
 upstream_author="tailscale"
 category="utilities"
 pkgdesc="Tailscale VPN client"
@@ -10,6 +10,7 @@ arch="aarch64 armv7"
 license="BSD-3-Clause"
 options="!check !fhs !strip !tracedeps"
 depends="mount-utils"
+subpackages="$pkgname-tun"
 
 source="
 https://dl.tailscale.com/stable/tailscale_${pkgver}_arm.tgz
@@ -22,23 +23,15 @@ $pkgname.post-os-upgrade
 builddir="$srcdir/tailscale"
 
 unpack() {
-	if [ -z "$force" ]; then
-		verify
-		initdcheck
-	fi
-
 	case "$CARCH" in
 		aarch64) _arch="arm64" ;;
 		armv7) _arch="arm" ;;
 	esac
-
-	mkdir -p "$srcdir"
 	_tar="$SRCDEST/tailscale_${pkgver}_$_arch.tgz"
 
 	msg "Unpacking $_tar..."
 	tar -C "$srcdir" -zxf "$_tar"
 	mv "$srcdir/tailscale_${pkgver}_$_arch" "$srcdir/tailscale"
-	msg "Unpacked."
 }
 
 package() {
@@ -134,6 +127,34 @@ predeinstall() {
 	fi
 }
 
+tun() {
+	pkgdesk="Tailscale kernel module support (only install this if you have the kernel module)"
+
+	package() {
+		cd "$srcdir/tailscale"
+
+		# Reset FLAGS
+		sed '/FLAGS/d' systemd/tailscaled.defaults > systemd/tailscaled.tun
+		echo 'FLAGS=""' >> systemd/tailscaled.tun
+
+		install -Dm644 systemd/tailscaled.tun \
+			"$subpkgdir/home/root/.vellum/etc/default/tailscaled"
+	}
+
+	postdeinstall() {
+		# Restore userspace
+		echo "restoring userspace networking..."
+		sed -i '/FLAGS/d' /home/root/.vellum/etc/default/tailscaled
+		echo 'FLAGS="--tun userspace-networking"' >> /home/root/.vellum/etc/default/tailscaled
+
+		echo "enabling tailscaled service..."
+		systemctl enable tailscaled.service
+
+		echo "restarting tailscaled service..."
+		systemctl restart tailscaled.service
+	}
+}
+
 sha512sums='
 7061960e1c3fb6bb5d6bc8626b16b558d6449e9e5e661982499d9e5626d04795ed26e07e85e9a827360d4e6b2b0b309e12f1b3ceb13dac6c5b3ce1308956b165  tailscale_1.96.2_arm.tgz
 f73f424d37f958e9d2bba0efa4878e10ff47da1f613d1babe56ef1c84e738439a2a94e94858075ded26d85a210288f255d3d4394b8e8ad7a9cc342363bba6a04  tailscale_1.96.2_arm64.tgz

From 05e1488b131f4959291a34d6299cd552ba46d1c8 Mon Sep 17 00:00:00 2001
From: Interloper <45214659+0xdeb7ef@users.noreply.github.com>
Date: Thu, 9 Apr 2026 11:23:55 -0700
Subject: [PATCH 2/2] Add explicit mapping to `tun` subpackage func

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
---
 packages/tailscale/VELBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tailscale/VELBUILD b/packages/tailscale/VELBUILD
index a937efd1..0d5985a3 100644
--- a/packages/tailscale/VELBUILD
+++ b/packages/tailscale/VELBUILD
@@ -10,7 +10,7 @@ arch="aarch64 armv7"
 license="BSD-3-Clause"
 options="!check !fhs !strip !tracedeps"
 depends="mount-utils"
-subpackages="$pkgname-tun"
+subpackages="$pkgname-tun:tun"
 
 source="
 https://dl.tailscale.com/stable/tailscale_${pkgver}_arm.tgz