Bikeshed comment

.gitmodules

@@ -2,7 +2,3 @@
 	path = mullvad-vpn-daemon/mullvadvpn-app
 	url = git@github.com:mullvad/mullvadvpn-app-priv.git
 	branch = poc-slint
-[submodule "mullvad-vpn-slint/mullvadvpn-app"]
-	path = mullvad-vpn-slint/mullvadvpn-app
-	url = git@github.com:mullvad/mullvadvpn-app-priv.git
-	branch = poc-slint

docker-build.sh

@@ -4,6 +4,8 @@ set -ex
 cd "$(dirname "$0")"
 
 package="$1"
+shift
+
 builder_image="mullvad-slint-musl-builder"
 cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
@@ -22,5 +24,5 @@ docker run --rm \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \
-    abuild -F
+    abuild -F "$@"
 

mullvad-vpn-daemon/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor:
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-daemon
-pkgver=2026.1_git
-pkgrel=4
+pkgver=2026.2_beta1
+pkgrel=1
 pkgdesc="Mullvad VPN system service"
 url="https://mullvad.net/"
 arch="all"
@@ -24,26 +24,39 @@ makedepends="
 	libnftnl-dev
 "
 checkdepends=""
-install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall"
-subpackages="$pkgname-systemd"
-source=""
-builddir="$srcdir/"
+install="
+	$pkgname.post-install
+	$pkgname.pre-upgrade
+	$pkgname.post-upgrade
+	$pkgname.pre-deinstall
+	$pkgname.post-deinstall
+ 	$pkgname-systemd.post-install
+	$pkgname-systemd.post-upgrade
+"
+subpackages="
+	$pkgname-systemd
+	$pkgname-suid
+"
+source="
+	https://github.com/mullvad/mullvadvpn-app/archive/refs/tags/2026.2-beta1.tar.gz
+"
+builddir="$srcdir/mullvadvpn-app-2026.2-beta1/"
 options="net suid"
 
-_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
+_cargo_target_dir="${CARGO_TARGET_DIR:-$builddir/target}"
+_cargo_release_dir="$_cargo_target_dir/$CHOST/release"
 
 prepare() {
 	default_prepare
 
-	cd "$startdir/mullvadvpn-app"
 	cargo fetch --target "$CHOST" --locked
 }
 
 build() {
-	cd "$startdir/mullvadvpn-app"
+	# Specify `--target` so that build artifacts will end up in target/<target>/release
+	# This avoids clashes with host system when running in a container with a mounted target folder.
 
-	# Specify `--target` so that the build artifacts ends up in target/<target>/release to
-	# avoid clashes with host system when running in a container with a mounted target folder.
+	# Compile all binaries
 	cargo auditable build --release --locked \
 	    --target "$CHOST" \
 	    -p mullvad-cli \
@@ -51,35 +64,55 @@ build() {
 	    -p mullvad-exclude \
 	    -p mullvad-problem-report \
 	    -p mullvad-setup
+
+	# Generate vendored relay list
+	cargo run --release --locked \
+	    -p mullvad-api --bin relay_list \
+	    --target "$CHOST" \
+	    > "$builddir/relays.json"
 }
 
 check() {
-	cd "$startdir/mullvadvpn-app"
 	cargo test --target "$CHOST" --frozen
 }
 
 package() {
-	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad" \
-		"$pkgdir"/usr/bin/mullvad
+	install -m755 -D "$_cargo_release_dir/mullvad" \
+		"$pkgdir/usr/bin/mullvad"
 
-	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \
-		"$pkgdir"/usr/bin/mullvad-daemon
+	install -m755 -D "$_cargo_release_dir/mullvad-daemon" \
+		"$pkgdir/usr/bin/mullvad-daemon"
 
-	# mullvad-exclude requires setuid
-	install -m4755 -D "$_cargo_target_dir/$CHOST/release/mullvad-exclude" \
-		"$pkgdir"/usr/bin/mullvad-exclude
+	install -m755 -D "$_cargo_release_dir/mullvad-problem-report" \
+		"$pkgdir/usr/bin/mullvad-problem-report"
 
-	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-problem-report" \
-		"$pkgdir"/usr/bin/mullvad-problem-report
+	install -m755 -D "$_cargo_release_dir/mullvad-setup" \
+		"$pkgdir/usr/bin/mullvad-setup"
 
-	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-setup" \
-		"$pkgdir"/usr/bin/mullvad-setup
+	# Bundle the vendored relay list. It's copied to /var/cache/mullvad-vpn/ by the post-* scripts.
+	install -m644 -D "$builddir/relays.json" \
+		"$pkgdir/usr/share/mullvad-vpn/relays.json"
 }
 
 systemd() {
+	pkgdesc="systemd service files for Mullvad VPN"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
 	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \
-		"$subpkgdir"/usr/lib/systemd/system/mullvad-daemon.service
+		"$subpkgdir/usr/lib/systemd/system/mullvad-daemon.service"
 
 	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-early-boot-blocking.service" \
-		"$subpkgdir"/usr/lib/systemd/system/mullvad-early-boot-blocking.service
+		"$subpkgdir/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
 }
+
+suid() {
+	pkgdesc="mullvad-exclude cli for split tunneling"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	install -m4755 -D "$_cargo_release_dir/mullvad-exclude" \
+		"$subpkgdir/usr/bin/mullvad-exclude"
+}
+
+sha512sums="
+9af0c263f0e5985d7842099f50a5070da0b23691f08ffe57c3b6d239d2c1c9acea89c07890f31d89bd75448a2dd1fd3c878b85be458baba0bcd90760e714b032  2026.2-beta1.tar.gz
+"

mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eu
+
+# Are we running systemd?
+if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+    # Does `mullvad-daemon.service` exist?
+    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
+      systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
+      systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
+      systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
+    fi
+fi

mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -eu
+
+# Are we running systemd?
+if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+    # Does `mullvad-daemon.service` exist?
+    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
+      systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
+      systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
+      systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
+    fi
+fi

mullvad-vpn-daemon/mullvad-vpn-daemon.post-install

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
-    if systemctl status mullvad-daemon &> /dev/null; then
-      systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
-      systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
-      systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
-    fi
-fi
+# Overwrite the cached relay list with the one embedded in the package.
+mkdir -p /var/cache/mullvad-vpn \
+  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+  || echo "failed to install /var/cache/mullvad-vpn/relays.json"

mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
-    if systemctl status mullvad-daemon &> /dev/null; then
-      systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
-      systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
-      systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
-    fi
-fi
+# Overwrite the cached relay list with the one embedded in the package.
+mkdir /var/cache/mullvad-vpn
+cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json

mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall

@@ -1,18 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-echo "Running prerm."
-is_number_re='^[0-9]+$'
-# Check if we're running during an upgrade step on Fedora
-# https://fedoraproject.org/wiki/Packaging:Scriptlets#Syntax
-if [[ "$1" =~ $is_number_re ]] && [ "$1" -gt 0 ]; then
-    exit 0;
-fi
-
-if [[ "$1" == "upgrade" ]]; then
-    exit 0;
-fi
-
 # the user might've disabled or stopped the service themselves already
 systemctl stop mullvad-daemon.service || true
 systemctl disable mullvad-daemon.service || true

mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -eu
 
+# Are we running systemd?
 if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+    # Is `mullvad-daemon.service` running?
     if systemctl status mullvad-daemon &> /dev/null; then
         mullvad-setup prepare-restart || true
         systemctl stop mullvad-daemon.service
@@ -12,5 +14,5 @@ if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offlin
     fi
 fi
 
-rm -f /var/cache/mullvad-vpn/relays.json
+# Since we are upgrading mullvad-daemon, it will probably have current IP baked into itself.
 rm -f /var/cache/mullvad-vpn/api-ip-address.txt

podman-build.sh

@@ -4,6 +4,8 @@ set -ex
 cd "$(dirname "$0")"
 
 package="$1"
+shift
+
 builder_image="mullvad-slint-musl-builder"
 cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
@@ -22,5 +24,5 @@ podman run --rm \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \
-    abuild -F
+    abuild -F "$@"