Make package function more compact

.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

Dockerfile

@@ -6,17 +6,16 @@ RUN apk update && apk add \
   build-base \
   abuild \
   git \
-	rustup \
-  musl-dev \
+	rust \
+	cargo-auditable \
   pkgconfig \
   protobuf-dev \
   protobuf-dev \
-  libmnl-dev \
-  libnftnl-dev \
-  dbus-dev \
-  fontconfig-dev
-  
-RUN rustup-init -y --default-toolchain stable
+  libmnl libmnl-dev \
+  libnftnl libnftnl-dev \
+  dbus dbus-dev \
+  fontconfig-dev \
+  wayland-dev
 
 # Set pkg-config to use static libraries
 ENV PKG_CONFIG_ALLOW_STATIC=1

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,73 +1,93 @@
-# Contributor:
-# Maintainer: Joakim Hulthe <joakim@hulthe.net>
+maintainer="Joakim Hulthe <joakim@hulthe.net>"
 pkgname=mullvad-vpn-daemon
-pkgver=2026.1_git
+pkgver=2026.2_beta1
 pkgrel=0
-pkgdesc="Mullvad VPN system service"
+pkgdesc="Mullvad VPN client (daemon and CLI)"
 url="https://mullvad.net/"
-arch="$(uname -m)"
-license="GPL-3-or-later"
-depends="
-"
+# Mullvad depends on old versions of the `nix` library
+# which are broken on on loongarch64 and s390x
+arch="all !loongarch64 !s390x"
+license="GPL-3.0-or-later"
 makedepends="
-  build-base
-	rustup
-  musl-dev
-  pkgconfig
+	cargo-auditable
 	git
 	protobuf-dev
+	dbus-dev
 	libmnl-dev
 	libnftnl-dev
-  dbus-dev
 "
-checkdepends=""
-# TODO: pre/post(de)install-scripts
-#install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall"
-install=""
-subpackages="$pkgname-systemd"
-source=""
-builddir="$srcdir/"
-options="net !check suid"
+install="
+	$pkgname.pre-upgrade
+	$pkgname.pre-deinstall
+	$pkgname-systemd.post-install
+	$pkgname-systemd.post-upgrade
+	$pkgname-systemd.pre-deinstall
+"
+subpackages="
+	$pkgname-systemd
+	$pkgname-suid
+"
+source="
+	https://github.com/mullvad/mullvadvpn-app/archive/refs/tags/${pkgver//_/-}.tar.gz
+"
+builddir="$srcdir/mullvadvpn-app-${pkgver//_/-}/"
+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
+
+	cargo fetch --target "$CHOST" --locked
+}
 
 build() {
-	# rustup-init -y --default-toolchain stable
-	source "$HOME/.cargo/env"
+	# Specify `--target` so that build artifacts will be in target/<target>/release
+	# This avoids clashes with host system when building in a container.
 
-	cd "$startdir/mullvadvpn-app"
-
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
-
-	# * Force the `stable` toolchain since it's installed in the container.
-	#   We don't wan't to needlessly download rust while building.
-	# * Specify `--target` so that the final binary ends up in target/<target>/release.
-	cargo +stable build --release --locked \
-	    --target "$target" \
-	    -p mullvad-daemon \
+	# Compile all binaries
+	cargo auditable build --release --frozen \
+		--target "$CHOST" \
 		-p mullvad-cli \
+		-p mullvad-daemon \
 		-p mullvad-exclude \
-	    -p mullvad-problem-report
+		-p mullvad-problem-report \
+		-p mullvad-setup
+}
+
+check() {
+	cargo test --target "$CHOST" --frozen
 }
 
 package() {
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+	install -m755 -Dt "$pkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad" \
+		"$_cargo_release_dir/mullvad-daemon" \
+		"$_cargo_release_dir/mullvad-problem-report" \
+		"$_cargo_release_dir/mullvad-setup"		
 
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-daemon" \
-		"$pkgdir"/usr/bin/mullvad-daemon
+	# TODO: Bundle a relay list.
+	# We can't generate one at build time since that would break build reproducibility.
+	# Once mullvad starts checking a relay list into their release branches, we can bundle that.
+	#install -m644 -D "$builddir/<todo>/relays.json" \
+	#	"$pkgdir/usr/share/mullvad-vpn/relays.json"
+	# TODO: Copy relay list into /var/cache/ in post-upgrade/post-install
 
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad" \
-		"$pkgdir"/usr/bin/mullvad
-
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-exclude" \
-		"$pkgdir"/usr/bin/mullvad-exclude
-	chmod u+s "$pkgdir"/usr/bin/mullvad-exclude
-
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-problem-report" \
-		"$pkgdir"/usr/bin/mullvad-problem-report
+	# files in /usr/lib/systemd/ are automatically put in systemd subpackage
+	install -m755 -Dt "$pkgdir/usr/lib/systemd/system/" \
+		"$builddir/dist-assets/linux/mullvad-daemon.service" \
+		"$builddir/dist-assets/linux/mullvad-early-boot-blocking.service"
 }
 
-systemd() {
-	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \
-		"$subpkgdir"/usr/lib/systemd/system/mullvad-daemon.service
+suid() {
+	pkgdesc="mullvad-exclude cli for split tunneling"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	install -m4755 -Dt "$subpkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad-exclude"
 }
+
+sha512sums="
+9af0c263f0e5985d7842099f50a5070da0b23691f08ffe57c3b6d239d2c1c9acea89c07890f31d89bd75448a2dd1fd3c878b85be458baba0bcd90760e714b032  2026.2-beta1.tar.gz
+"

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

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -eu
+
+# Enable and start systemd services
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; 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

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

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -eu
+
+# Enable and start systemd services
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; 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

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

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+# Stop and disable all mullvad services
+systemctl stop mullvad-daemon.service || true
+systemctl disable mullvad-daemon.service || true
+systemctl stop mullvad-early-boot-blocking.service || true
+systemctl disable mullvad-early-boot-blocking.service || true

mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-function remove_logs_and_cache {
-  rm -r --interactive=never /var/log/mullvad-vpn/ || \
-    echo "Failed to remove mullvad-vpn logs"
-  rm -r --interactive=never /var/cache/mullvad-vpn/ || \
-    echo "Failed to remove mullvad-vpn cache"
-}
-
-function remove_config {
-  rm -r --interactive=never /etc/mullvad-vpn || \
-    echo "Failed to remove mullvad-vpn config"
-}
-
-function remove_symlinks {
-  rm /usr/bin/mullvad-problem-report || \
-    echo "Failed to remove mullvad-problem-report"
-}
-
-# checking what kind of an action is taking place
-case $@ in
-  # apt purge passes "purge"
-  "purge")
-    remove_logs_and_cache
-    remove_config
-    remove_symlinks
-    ;;
-  # apt remove passes "remove"
-  "remove")
-    remove_symlinks
-    ;;
-  # dnf remove passes a 0
-  "0")
-    remove_logs_and_cache
-    remove_config
-    remove_symlinks
-    ;;
-esac

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

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
-ln -sf /opt/Mullvad\ VPN/resources/mullvad-problem-report /usr/bin/mullvad-problem-report
-
-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"
+# TODO: see `package()` in APKBUILD
+# Copy vendored relay list into place
+# 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

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+# TODO: see `package()` in APKBUILD
+# Overwrite the cached relay list with the vendored one.
+# 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.pre-deinstall

@@ -1,23 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/sh
 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
-systemctl stop mullvad-early-boot-blocking.service || true
-systemctl disable mullvad-early-boot-blocking.service || true
-
-/opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || echo "Failed to reset firewall"
-/opt/Mullvad\ VPN/resources/mullvad-setup remove-device || echo "Failed to remove device from account"
+# Log out and remove any firewall rules
+mullvad-setup reset-firewall || echo "Failed to reset firewall"
+mullvad-setup remove-device || echo "Failed to remove device from account"

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

@@ -1,9 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/sh
 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
-        /opt/Mullvad\ VPN/resources/mullvad-setup prepare-restart || true
+# Stop the daemon gracefully, and set up firewall rules to prevent network
+# leaks during upgrade.
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; then
+    if systemctl status mullvad-daemon >/dev/null 2>&1; then
+        mullvad-setup prepare-restart || true
         systemctl stop mullvad-daemon.service
         systemctl disable mullvad-daemon.service
         systemctl disable mullvad-early-boot-blocking.service || true
@@ -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
+# Clear the cached API IP address.
 rm -f /var/cache/mullvad-vpn/api-ip-address.txt

mullvad-vpn-slint/APKBUILD

@@ -2,22 +2,23 @@
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-slint
 pkgver=2026.1_git
-pkgrel=0
+pkgrel=4
 pkgdesc="Mullvad VPN GUI"
 url="https://mullvad.net/"
-arch="$(uname -m)"
+arch="all"
 license="GPL-3-or-later"
 # TODO: maybe depend on mullvad-vpn-daemon?
 depends="
 "
 makedepends="
 	build-base
-	rustup
-  musl-dev
+	cargo-auditable
+	rust
 	pkgconfig
 	protobuf-dev
 	fontconfig-dev
 	dbus-dev
+	wayland-dev
 "
 checkdepends=""
 install=""
@@ -28,28 +29,25 @@ options="net !check"
 
 _cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 
-build() {
-	# rustup-init -y --default-toolchain stable
-	source "$HOME/.cargo/env"
+prepare() {
+	default_prepare
 
 	cd "$startdir/mullvadvpn-app"
+	cargo fetch --target "$CHOST" --locked
+}
 
-	# rustup default stable
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+build() {
+	cd "$startdir/mullvadvpn-app"
 
-	# * Force the `stable` toolchain since it's installed in the container.
-	#   We don't wan't to needlessly download rust while building.
-	# * Specify `--target` so that the final binary ends up in target/<target>/release.
-	cargo +stable build --release --locked \
-	    --target "$target" \
+	# Specify `--target` so that the final binary ends up in target/<target>/release.
+	cargo build --release --locked \
+	    --target "$CHOST" \
 	    -p mullvad-slint
 }
 
 package() {
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
-
 	# Executable
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-slint" \
 		"$pkgdir"/usr/bin/mullvad-slint
 
 	# .desktop file
@@ -57,31 +55,31 @@ package() {
 		"$pkgdir"/usr/share/applications/mullvad-vpn-slint.desktop
 	
   # Icons
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_1_16x16x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/16x16/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/16x16/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_2_20x20x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/20x20/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/20x20/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_3_24x24x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/24x24/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/24x24/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_5_30x30x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/30x30/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/30x30/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_6_32x32x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/32x32/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/32x32/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_7_36x36x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/36x36/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/36x36/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_8_40x40x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/40x40/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/40x40/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_9_48x48x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/48x48/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/48x48/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_12_64x64x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/64x64/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/64x64/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_13_72x72x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/72x72/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/72x72/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_15_96x96x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/96x96/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/96x96/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_4_256x256x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/256x256/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/256x256/apps/mullvad.png
-	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_10_512x512x32.png" \
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/512x512/apps/mullvad.png" \
 		"$pkgdir"/usr/share/icons/hicolor/512x512/apps/mullvad.png
 }
 

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 "$@"