From 3ff5cf83fc9166a9f925fef03d82a4240912a39c Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Sun, 12 Apr 2026 12:52:08 +0200
Subject: [PATCH] APKBUILD fixes

---
 mullvad-vpn-daemon/APKBUILD | 15 +++++++-------
 mullvad-vpn-slint/APKBUILD  | 41 +++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD
index 55825d9..769700a 100644
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-daemon
 pkgver=2026.1_git
-pkgrel=2
+pkgrel=3
 pkgdesc="Mullvad VPN system service"
 url="https://mullvad.net/"
-arch="$(uname -m)"
+arch="all"
 license="GPL-3-or-later"
 depends="
 	dbus
@@ -42,9 +42,8 @@ prepare() {
 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.
+	# 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.
 	cargo auditable build --release --locked \
 	    --target "$CHOST" \
 	    -p mullvad-cli \
@@ -56,7 +55,7 @@ build() {
 
 check() {
 	cd "$startdir/mullvadvpn-app"
-	cargo test --frozen
+	cargo test --target "$CHOST" --frozen
 }
 
 package() {
@@ -66,9 +65,9 @@ package() {
 	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \
 		"$pkgdir"/usr/bin/mullvad-daemon
 
-	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-exclude" \
+	# mullvad-exclude requires setuid
+	install -m4755 -D "$_cargo_target_dir/$CHOST/release/mullvad-exclude" \
 		"$pkgdir"/usr/bin/mullvad-exclude
-	chmod u+s "$pkgdir"/usr/bin/mullvad-exclude
 
 	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-problem-report" \
 		"$pkgdir"/usr/bin/mullvad-problem-report
diff --git a/mullvad-vpn-slint/APKBUILD b/mullvad-vpn-slint/APKBUILD
index c010bde..e19151f 100644
--- a/mullvad-vpn-slint/APKBUILD
+++ b/mullvad-vpn-slint/APKBUILD
@@ -2,22 +2,22 @@
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-slint
 pkgver=2026.1_git
-pkgrel=2
+pkgrel=3
 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
-  pkgconfig
-  protobuf-dev
-  fontconfig-dev
-  dbus-dev
+	build-base
+	cargo-auditable
+	rust
+	pkgconfig
+	protobuf-dev
+	fontconfig-dev
+	dbus-dev
 "
 checkdepends=""
 install=""
@@ -28,28 +28,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