add scripts to build mullvad-vpn-slint with podman

2026-03-28 19:27:39 +01:00
13 changed files with 49 additions and 261 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +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
--- a/56
+++ b/56
@@ -1,21 +1,57 @@
-FROM alpine:edge
+FROM alpine:3.21

 # Install build dependencies
 # TODO: trim dependencies?
 RUN apk update && apk add \
+  build-base abuild \
+	rustup \
  build-base \
-  abuild \
-  git \
-	rust \
-	cargo-auditable \
+  musl-dev \
+  gcc \
+  cmake \
+  make \
  pkgconfig \
+  perl \
+  python3 \
+  curl \
+  git \
+  llvm \
+  clang \
+  clang-libclang \
  protobuf-dev \
-  protobuf-dev \
-  libmnl libmnl-dev \
-  libnftnl libnftnl-dev \
-  dbus dbus-dev \
+  libc-dev \
+  linux-headers \
+  freetype-dev \
+  freetype-static \
  fontconfig-dev \
-  wayland-dev
+  fontconfig-static \
+  bzip2-dev \
+  bzip2-static \
+  brotli-dev \
+  brotli-static \
+  expat-dev \
+  expat-static \
+  libx11-dev \
+  libxcursor-dev \
+  libxkbcommon-dev \
+  libxkbcommon-static \
+  wayland-dev \
+  wayland-libs-client \
+  wayland-libs-server \
+  wayland-static \
+  openssl-dev \
+  openssl-libs-static \
+  zlib-dev \
+  zlib-static \
+  libpng-dev \
+  libpng-static \
+  libwebp-dev \
+  libwebp-static \
+  tiff-dev \
+  libjpeg-turbo-dev \
+  libjpeg-turbo-static
+  
+RUN rustup-init -y --default-toolchain stable

 # Set pkg-config to use static libraries
 ENV PKG_CONFIG_ALLOW_STATIC=1
--- a/README.md
+++ b/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
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -ex
-cd "$(dirname "$0")"
-
-package="$1"
-shift
-
-builder_image="mullvad-slint-musl-builder"
-cargo_home="${CARGO_HOME:-$HOME/.cargo}"
-. "$HOME/.abuild/abuild.conf"
-
-docker build . -f Dockerfile -t "$builder_image"
-docker run --rm \
-    -v "./$package":/build \
-    -v ./abuild.conf:/root/.abuild/abuild.conf:ro \
-    -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 \
-    -e "CARGO_TARGET_DIR=/cargo-target" \
-    -it \
-    "$builder_image" \
-    abuild -F "$@"
-
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -1,90 +0,0 @@
-maintainer="Joakim Hulthe <joakim@hulthe.net>"
-pkgname=mullvad-vpn-daemon
-pkgver=2026.3_beta1
-pkgrel=1
-pkgdesc="Mullvad VPN client (daemon and CLI)"
-url="https://mullvad.net/"
-# 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="
-	cargo-auditable
-	git
-	protobuf-dev
-	dbus-dev
-	libmnl-dev
-	libnftnl-dev
-"
-install="
-	$pkgname.post-install
-	$pkgname.post-upgrade
-	$pkgname.pre-upgrade
-	$pkgname-systemd.post-install
-	$pkgname-systemd.post-upgrade
-"
-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:-$builddir/target}"
-_cargo_release_dir="$_cargo_target_dir/$CHOST/release"
-
-prepare() {
-	default_prepare
-
-	cargo fetch --target "$CHOST" --locked
-}
-
-build() {
-	# Specify `--target` so that build artifacts will be in target/<target>/release
-	# This avoids clashes with host system when building in a container.
-
-	# 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-setup
-}
-
-check() {
-	cargo test --target "$CHOST" --frozen
-}
-
-package() {
-	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"
-
-	# Bundle the relay list.
-	install -m644 -D "$builddir/dist-assets/relays/relays.json" \
-		"$pkgdir/usr/share/mullvad-vpn/relays.json"
-
-	# 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"
-}
-
-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="
-7766ad0401cd42a43c272726bd600e70d29a95f4f9b5192cc906e6e7008139a403fb6128a00940ea1306c0446f8af4a43d2f3fd89c6cd81a730be9db8ae50f82  2026.3-beta1.tar.gz
-"
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -eu
-
-echo '>>> To start Mullvad VPN, enable the daemon:'
-echo '    systemctl enable --now mullvad-daemon.service'
-echo ''
-echo '>>> Optional: block network until VPN is up at boot:'
-echo '    systemctl enable mullvad-early-boot-blocking.service'
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-
-# Mark systemd service for restart
-systemctl set-property mullvad-daemon.service Markers=+needs-restart \
-  || echo "Failed to mark mullvad-daemon for restart"
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-
-# 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"
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -eu
-
-# Overwrite the cached relay list with the vendored one.
-# The new daemon should contain an up-to-date list.
-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"
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -eu
-
-# Clear the cached API IP address.
-# The new daemon should contain an up-to-date address.
-rm -f /var/cache/mullvad-vpn/api-ip-address.txt
--- a/mullvad-vpn-slint/APKBUILD
+++ b/mullvad-vpn-slint/APKBUILD
@@ -1,85 +0,0 @@
-# Contributor:
-# Maintainer: Joakim Hulthe <joakim@hulthe.net>
-pkgname=mullvad-vpn-slint
-pkgver=2026.1_git
-pkgrel=4
-pkgdesc="Mullvad VPN GUI"
-url="https://mullvad.net/"
-arch="all"
-license="GPL-3-or-later"
-# TODO: maybe depend on mullvad-vpn-daemon?
-depends="
-"
-makedepends="
-	build-base
-	cargo-auditable
-	rust
-	pkgconfig
-	protobuf-dev
-	fontconfig-dev
-	dbus-dev
-	wayland-dev
-"
-checkdepends=""
-install=""
-subpackages=""
-source=""
-builddir="$srcdir/"
-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() {
-	cd "$startdir/mullvadvpn-app"
-
-	# Specify `--target` so that the final binary ends up in target/<target>/release.
-	cargo build --release --locked \
-	    --target "$CHOST" \
-	    -p mullvad-slint
-}
-
-package() {
-	# Executable
-	install -m755 -D "$_cargo_target_dir/$CHOST/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
-}
-
--- a/mullvad-vpn-slint/mullvadvpn-app
+++ b/mullvad-vpn-slint/mullvadvpn-app
--- a/podman-build.sh
+++ b/podman-build.sh
@@ -4,10 +4,7 @@ set -ex
 cd "$(dirname "$0")"

 package="$1"
-shift
-
 builder_image="mullvad-slint-musl-builder"
-cargo_home="${CARGO_HOME:-$HOME/.cargo}"
 . "$HOME/.abuild/abuild.conf"

 podman build . -f Dockerfile -t "$builder_image"
@@ -17,12 +14,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 ./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" \
-    abuild -F "$@"
+    abuild -F