4 Commits

5 changed files with 54 additions and 48 deletions

View File

@@ -6,17 +6,15 @@ 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
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

View File

@@ -2,68 +2,76 @@
# 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=1
pkgdesc="Mullvad VPN system service" pkgdesc="Mullvad VPN system service"
url="https://mullvad.net/" url="https://mullvad.net/"
arch="$(uname -m)" arch="$(uname -m)"
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 # TODO: pre/post(de)install-scripts
#install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall"
install="" #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. # * Force the `stable` toolchain since it's installed in the container.
# We don't wan't to needlessly download rust while building. # 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 final binary ends up in target/<target>/release.
cargo +stable build --release --locked \ cargo auditable build --release --locked \
--target "$target" \ --target "$CHOST" \
-p mullvad-daemon \ -p mullvad-daemon \
-p mullvad-cli \ -p mullvad-cli \
-p mullvad-exclude \ -p mullvad-exclude \
-p mullvad-problem-report -p mullvad-problem-report
} }
package() { check() {
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")" cd "$startdir/mullvadvpn-app"
cargo test --frozen
}
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-daemon" \ package() {
install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \
"$pkgdir"/usr/bin/mullvad-daemon "$pkgdir"/usr/bin/mullvad-daemon
install -m755 -D "$_cargo_target_dir/$target/release/mullvad" \ install -m755 -D "$_cargo_target_dir/$CHOST/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-exclude" \
"$pkgdir"/usr/bin/mullvad-exclude "$pkgdir"/usr/bin/mullvad-exclude
chmod u+s "$pkgdir"/usr/bin/mullvad-exclude chmod u+s "$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 "$pkgdir"/usr/bin/mullvad-problem-report
} }

View File

@@ -2,7 +2,7 @@
# 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=1
pkgdesc="Mullvad VPN GUI" pkgdesc="Mullvad VPN GUI"
url="https://mullvad.net/" url="https://mullvad.net/"
arch="$(uname -m)" arch="$(uname -m)"
@@ -57,31 +57,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
} }