mullvad-vpn-daemon: Add systemd subpkg

.gitmodules

@@ -1,8 +0,0 @@
-[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,16 +6,17 @@ RUN apk update && apk add \
   build-base \
   abuild \
   git \
-	rust \
+	rustup \
-	cargo-auditable \
+  musl-dev \
   pkgconfig \
   protobuf-dev \
   protobuf-dev \
-  libmnl libmnl-dev \
+  libmnl-dev \
-  libnftnl libnftnl-dev \
+  libnftnl-dev \
-  dbus dbus-dev \
+  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.
+   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.
 3. Remember to keep keys around.
 
 ## Building

docker-build.sh

@@ -5,7 +5,6 @@ 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"
@@ -15,10 +14,8 @@ 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 ./packages:/root/packages \
-    -v "$cargo_home":/cargo-home \
-    -e "CARGO_HOME=/cargo-home" \
     -v ./target:/cargo-target \
+    -v ./packages:/root/packages \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \

mullvad-vpn-daemon/APKBUILD

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

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

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

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

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

@@ -1,16 +0,0 @@
-#!/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,23 +2,22 @@
 # Maintainer: Joakim Hulthe <joakim@hulthe.net>
 pkgname=mullvad-vpn-slint
 pkgver=2026.1_git
-pkgrel=4
+pkgrel=0
 pkgdesc="Mullvad VPN GUI"
 url="https://mullvad.net/"
-arch="all"
+arch="$(uname -m)"
 license="GPL-3-or-later"
 # TODO: maybe depend on mullvad-vpn-daemon?
 depends="
 "
 makedepends="
-	build-base
+  build-base
-	cargo-auditable
+	rustup
-	rust
+  musl-dev
-	pkgconfig
+  pkgconfig
-	protobuf-dev
+  protobuf-dev
-	fontconfig-dev
+  fontconfig-dev
-	dbus-dev
+  dbus-dev
-	wayland-dev
 "
 checkdepends=""
 install=""
@@ -29,57 +28,30 @@ options="net !check"
 
 _cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 
-prepare() {
-	default_prepare
-
-	cd "$startdir/mullvadvpn-app"
-	cargo fetch --target "$CHOST" --locked
-}
-
 build() {
+	# rustup-init -y --default-toolchain stable
+	source "$HOME/.cargo/env"
+
 	cd "$startdir/mullvadvpn-app"
 
-	# Specify `--target` so that the final binary ends up in target/<target>/release.
+	# rustup default stable
-	cargo build --release --locked \
+	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
-	    --target "$CHOST" \
+
+	# * 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-slint
 }
 
 package() {
-	# Executable
+	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
-	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,7 +5,6 @@ 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"
@@ -15,10 +14,8 @@ 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 ./packages:/root/packages \
-    -v "$cargo_home":/cargo-home \
-    -e "CARGO_HOME=/cargo-home" \
     -v ./target:/cargo-target \
+    -v ./packages:/root/packages \
     -e "CARGO_TARGET_DIR=/cargo-target" \
     -it \
     "$builder_image" \