Add wayland-dev as slint build dependency

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "mullvad-vpn-daemon/mullvadvpn-app"]
+	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 \
+	rust \
-  musl-dev \
+	cargo-auditable \
   pkgconfig \
   protobuf-dev \
   protobuf-dev \
-  libmnl-dev \
+  libmnl libmnl-dev \
-  libnftnl-dev \
+  libnftnl libnftnl-dev \
-  dbus-dev \
+  dbus dbus-dev \
-  fontconfig-dev
+  fontconfig-dev \
-  
+  wayland-dev
-RUN rustup-init -y --default-toolchain stable
 
 # Set pkg-config to use static libraries
 ENV PKG_CONFIG_ALLOW_STATIC=1

README.md

@@ -4,7 +4,7 @@
 
 1. Install `abuild`
 2. Create keys: `abuild-keygen`
-   The keys will end up in ~/.abuild/, and will be mounted into the build container by podma, and will be mounted into the build container.
+   The keys will end up in ~/.abuild/, and will be mounted into the build container.
 3. Remember to keep keys around.
 
 ## Building

docker-build.sh

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
 
 package="$1"
 builder_image="mullvad-slint-musl-builder"
+cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
 
 docker build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ docker run --rm \
     -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
     -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
     -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-    -v ./target:/cargo-target \
     -v ./packages:/root/packages \
+    -v "$cargo_home":/cargo-home \
+    -e "CARGO_HOME=/cargo-home" \
+    -v ./target:/cargo-target \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \

mullvad-vpn-daemon/APKBUILD

@@ -2,74 +2,84 @@
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-daemon
 pkgver=2026.1_git
-pkgrel=0
+pkgrel=4
-pkgdesc="Mullvad VPN GUI"
+pkgdesc="Mullvad VPN system service"
 url="https://mullvad.net/"
-arch="$(uname -m)"
+arch="all"
 license="GPL-3-or-later"
 depends="
+	dbus
+	libmnl
+	libnftnl
 "
-# TODO: dbus-dev? also Dockerfile
-# TODO: libmnl-dev? also Dockerfile
-# TODO: libnftnl-dev? also Dockerfile
-# TODO: git? also Dockerfile
 makedepends="
 	build-base
-	rustup
+	cargo-auditable
-  musl-dev
+	rust
 	pkgconfig
 	git
 	protobuf-dev
+	dbus-dev
 	libmnl-dev
 	libnftnl-dev
-  dbus-dev
 "
 checkdepends=""
-install=""
+install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall"
-subpackages=""
+subpackages="$pkgname-systemd"
 source=""
 builddir="$srcdir/"
-options="net !check suid"
+options="net suid"
 
 _cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 
-build() {
+prepare() {
-	# rustup-init -y --default-toolchain stable
+	default_prepare
-	source "$HOME/.cargo/env"
 
 	cd "$startdir/mullvadvpn-app"
+	cargo fetch --target "$CHOST" --locked
+}
 
-	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.
+	# Specify `--target` so that the build artifacts ends up in target/<target>/release to
-	#   We don't wan't to needlessly download rust while building.
+	# avoid clashes with host system when running in a container with a mounted target folder.
-	# * Specify `--target` so that the final binary ends up in target/<target>/release.
+	cargo auditable build --release --locked \
-	cargo +stable build --release --locked \
+	    --target "$CHOST" \
-	    --target "$target" \
-	    -p mullvad-daemon \
 	    -p mullvad-cli \
+	    -p mullvad-daemon \
 	    -p mullvad-exclude \
-	    -p mullvad-problem-report
+	    -p mullvad-problem-report \
+	    -p mullvad-setup
+}
+
+check() {
+	cd "$startdir/mullvadvpn-app"
+	cargo test --target "$CHOST" --frozen
 }
 
 package() {
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad" \
-
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-daemon" \
-		"$pkgdir"/usr/bin/mullvad-daemon
-
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad" \
 		"$pkgdir"/usr/bin/mullvad
 
-  # TODO: setuid
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-exclude" \
+		"$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_target_dir/$target/release/mullvad-problem-report" \
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-problem-report" \
 		"$pkgdir"/usr/bin/mullvad-problem-report
-	chmod u+s "$pkgdir"/usr/bin/mullvad-problem-report
 
-	# TODO: systemd services
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-setup" \
-	# TODO: pre/post(de)install-scripts
+		"$pkgdir"/usr/bin/mullvad-setup
 }
 
+systemd() {
+	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/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
+}

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

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -eu
+
+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"
+rm -r --interactive=never /etc/mullvad-vpn || \
+  echo "Failed to remove mullvad-vpn config"

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

@@ -0,0 +1,10 @@
+#!/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

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

@@ -0,0 +1,10 @@
+#!/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

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

@@ -0,0 +1,23 @@
+#!/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
+systemctl stop mullvad-early-boot-blocking.service || true
+systemctl disable mullvad-early-boot-blocking.service || true
+
+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

@@ -0,0 +1,16 @@
+#!/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
+        mullvad-setup prepare-restart || true
+        systemctl stop mullvad-daemon.service
+        systemctl disable mullvad-daemon.service
+        systemctl disable mullvad-early-boot-blocking.service || true
+        cp /var/log/mullvad-vpn/daemon.log /var/log/mullvad-vpn/old-install-daemon.log \
+            || echo "Failed to copy old daemon log"
+    fi
+fi
+
+rm -f /var/cache/mullvad-vpn/relays.json
+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
+	cargo-auditable
-  musl-dev
+	rust
 	pkgconfig
 	protobuf-dev
 	fontconfig-dev
 	dbus-dev
+	wayland-dev
 "
 checkdepends=""
 install=""
@@ -28,30 +29,57 @@ options="net !check"
 
 _cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 
-build() {
+prepare() {
-	# rustup-init -y --default-toolchain stable
+	default_prepare
-	source "$HOME/.cargo/env"
 
 	cd "$startdir/mullvadvpn-app"
+	cargo fetch --target "$CHOST" --locked
+}
 
-	# rustup default stable
+build() {
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+	cd "$startdir/mullvadvpn-app"
 
-	# * Force the `stable` toolchain since it's installed in the container.
+	# Specify `--target` so that the final binary ends up in target/<target>/release.
-	#   We don't wan't to needlessly download rust while building.
+	cargo build --release --locked \
-	# * Specify `--target` so that the final binary ends up in target/<target>/release.
+	    --target "$CHOST" \
-	cargo +stable build --release --locked \
-	    --target "$target" \
 	    -p mullvad-slint
 }
 
 package() {
-	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+	# Executable
-
+	install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-slint" \
-	# TODO: .desktop
-	# TODO: icon
-
-	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
 		"$pkgdir"/usr/bin/mullvad-slint
+
+	# .desktop file
+	install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/mullvad-vpn-slint.desktop" \
+		"$pkgdir"/usr/share/applications/mullvad-vpn-slint.desktop
+	
+  # Icons
+	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/20x20/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/20x20/apps/mullvad.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/30x30/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/30x30/apps/mullvad.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/36x36/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/36x36/apps/mullvad.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/48x48/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/48x48/apps/mullvad.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/72x72/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/72x72/apps/mullvad.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/256x256/apps/mullvad.png" \
+		"$pkgdir"/usr/share/icons/hicolor/256x256/apps/mullvad.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

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
 
 package="$1"
 builder_image="mullvad-slint-musl-builder"
+cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"
 
 podman build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ podman run --rm \
     -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
     -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
     -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-    -v ./target:/cargo-target \
     -v ./packages:/root/packages \
+    -v "$cargo_home":/cargo-home \
+    -e "CARGO_HOME=/cargo-home" \
+    -v ./target:/cargo-target \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \