hulthe/mullvad-vpn-alpine
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: hulthe:2026.1-dev-3b2ed4
Branches Tags
hulthe:master
hulthe:2026.1-dev-236bbc4c hulthe:2026.1-dev-27f4b0 hulthe:2026.1-dev-3b2ed4
..
compare: hulthe:2026.1-dev-236bbc4c
Branches Tags
hulthe:master
hulthe:2026.1-dev-236bbc4c hulthe:2026.1-dev-27f4b0 hulthe:2026.1-dev-3b2ed4

9 Commits
2026.1-dev ... 2026.1-dev

Author SHA1 Message Date
Joakim Hulthe
29043fedc1 Add wayland-dev as slint build dependency 2026-04-17 16:30:40 +02:00
Joakim Hulthe
6462c4e25d Update submodules to 236bbc4c 2026-04-17 16:26:59 +02:00
Joakim Hulthe
6899a71899 Add early-boot-blocking.service 2026-04-17 16:24:55 +02:00
Joakim Hulthe
3ff5cf83fc APKBUILD fixes 2026-04-12 12:52:08 +02:00
Joakim Hulthe
84c30e3130 Update submodule to 4470547b 2026-04-10 11:52:07 +02:00
Joakim Hulthe
4e232c39be Include install-scripts 2026-04-09 22:45:05 +02:00
Joakim Hulthe
c5383fd2c9 Work on making daemon APKBUILD follow best practices 2026-04-09 21:15:52 +02:00
Joakim Hulthe
374eeba758 Bump submodules to 7cd3cfe2 2026-04-09 15:32:54 +02:00
Joakim Hulthe
0a93fe0370 Bump submodules to 27f4b024 2026-03-31 17:26:34 +02:00
10 changed files with 116 additions and 125 deletions
Expand all files Collapse all files

15
Dockerfile
View File

@@ -6,17 +6,16 @@ RUN apk update && apk add \
build-base \ build-base \
abuild \ abuild \
git \ git \
rustup \ rust \
musl-dev \ cargo-auditable \
pkgconfig \ pkgconfig \
protobuf-dev \ protobuf-dev \
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 # Set pkg-config to use static libraries
ENV PKG_CONFIG_ALLOW_STATIC=1 ENV PKG_CONFIG_ALLOW_STATIC=1

84
mullvad-vpn-daemon/APKBUILD
View File

@@ -2,72 +2,84 @@
# Maintainer: Joakim Hulthe <joakim@hulthe.net> # Maintainer: Joakim Hulthe <joakim@hulthe.net>
pkgname=mullvad-vpn-daemon pkgname=mullvad-vpn-daemon
pkgver=2026.1_git pkgver=2026.1_git
pkgrel=0 pkgrel=4
pkgdesc="Mullvad VPN system service" pkgdesc="Mullvad VPN system service"
url="https://mullvad.net/" url="https://mullvad.net/"
arch="$(uname -m)" arch="all"
license="GPL-3-or-later" license="GPL-3-or-later"
depends=" depends="
dbus
libmnl
libnftnl
" "
makedepends=" makedepends="
build-base build-base
rustup cargo-auditable
musl-dev rust
pkgconfig pkgconfig
git git
protobuf-dev protobuf-dev
libmnl-dev dbus-dev
libnftnl-dev libmnl-dev
dbus-dev libnftnl-dev
" "
checkdepends="" checkdepends=""
# TODO: pre/post(de)install-scripts install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall"
#install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall"
install=""
subpackages="$pkgname-systemd" subpackages="$pkgname-systemd"
source="" source=""
builddir="$srcdir/" builddir="$srcdir/"
options="net !check suid" options="net suid"
_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}" _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" 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-cli \
-p mullvad-daemon \
-p mullvad-exclude \ -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() { 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 "$pkgdir"/usr/bin/mullvad
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-exclude" \ install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \
"$pkgdir"/usr/bin/mullvad-exclude "$pkgdir"/usr/bin/mullvad-daemon
chmod u+s "$pkgdir"/usr/bin/mullvad-exclude
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-problem-report" \ # 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/$CHOST/release/mullvad-problem-report" \
"$pkgdir"/usr/bin/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() { systemd() {
install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \ install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \
"$subpkgdir"/usr/lib/systemd/system/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
} }

42
mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall
View File

@@ -1,39 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu set -eu
function remove_logs_and_cache { rm -r --interactive=never /var/log/mullvad-vpn/ || \
rm -r --interactive=never /var/log/mullvad-vpn/ || \ echo "Failed to remove mullvad-vpn logs"
echo "Failed to remove mullvad-vpn logs" rm -r --interactive=never /var/cache/mullvad-vpn/ || \
rm -r --interactive=never /var/cache/mullvad-vpn/ || \ echo "Failed to remove mullvad-vpn cache"
echo "Failed to remove mullvad-vpn cache" rm -r --interactive=never /etc/mullvad-vpn || \
} echo "Failed to remove mullvad-vpn config"
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

12
mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
View File

@@ -1,8 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu set -eu
ln -sf /opt/Mullvad\ VPN/resources/mullvad-problem-report /usr/bin/mullvad-problem-report 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 enable "/usr/lib/systemd/system/mullvad-daemon.service"
systemctl start mullvad-daemon.service || echo "Failed to start 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" systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
fi
fi

10
mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade Normal file
View File

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

4
mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall
View File

@@ -19,5 +19,5 @@ systemctl disable mullvad-daemon.service || true
systemctl stop mullvad-early-boot-blocking.service || true systemctl stop mullvad-early-boot-blocking.service || true
systemctl disable 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" mullvad-setup reset-firewall || echo "Failed to reset firewall"
/opt/Mullvad\ VPN/resources/mullvad-setup remove-device || echo "Failed to remove device from account" mullvad-setup remove-device || echo "Failed to remove device from account"

2
mullvad-vpn-daemon/mullvad-vpn-daemon.pre-install → mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
View File

@@ -3,7 +3,7 @@ set -eu
if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
if systemctl status mullvad-daemon &> /dev/null; then if systemctl status mullvad-daemon &> /dev/null; then
/opt/Mullvad\ VPN/resources/mullvad-setup prepare-restart || true mullvad-setup prepare-restart || true
systemctl stop mullvad-daemon.service systemctl stop mullvad-daemon.service
systemctl disable mullvad-daemon.service systemctl disable mullvad-daemon.service
systemctl disable mullvad-early-boot-blocking.service || true systemctl disable mullvad-early-boot-blocking.service || true

2
mullvad-vpn-daemon/mullvadvpn-app

Submodule mullvad-vpn-daemon/mullvadvpn-app updated: 3b2ed42454...236bbc4c0e

68
mullvad-vpn-slint/APKBUILD
View File

@@ -2,22 +2,23 @@
# Maintainer: Joakim Hulthe <joakim@hulthe.net> # Maintainer: Joakim Hulthe <joakim@hulthe.net>
pkgname=mullvad-vpn-slint pkgname=mullvad-vpn-slint
pkgver=2026.1_git pkgver=2026.1_git
pkgrel=0 pkgrel=4
pkgdesc="Mullvad VPN GUI" pkgdesc="Mullvad VPN GUI"
url="https://mullvad.net/" url="https://mullvad.net/"
arch="$(uname -m)" arch="all"
license="GPL-3-or-later" license="GPL-3-or-later"
# TODO: maybe depend on mullvad-vpn-daemon? # TODO: maybe depend on mullvad-vpn-daemon?
depends=" depends="
" "
makedepends=" makedepends="
build-base build-base
rustup cargo-auditable
musl-dev rust
pkgconfig pkgconfig
protobuf-dev protobuf-dev
fontconfig-dev fontconfig-dev
dbus-dev dbus-dev
wayland-dev
" "
checkdepends="" checkdepends=""
install="" install=""
@@ -28,28 +29,25 @@ options="net !check"
_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}" _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" 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 -p mullvad-slint
} }
package() { package() {
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
# Executable # 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 "$pkgdir"/usr/bin/mullvad-slint
# .desktop file # .desktop file
@@ -57,31 +55,31 @@ package() {
"$pkgdir"/usr/share/applications/mullvad-vpn-slint.desktop "$pkgdir"/usr/share/applications/mullvad-vpn-slint.desktop
# Icons # 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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$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 "$pkgdir"/usr/share/icons/hicolor/512x512/apps/mullvad.png
} }

2
mullvad-vpn-slint/mullvadvpn-app

Submodule mullvad-vpn-slint/mullvadvpn-app updated: 3b2ed42454...236bbc4c0e