Compare commits
2 Commits
2026.1-dev
...
ddb3ed3699
| Author | SHA1 | Date | |
|---|---|---|---|
|
ddb3ed3699 | ||
|
|
16c9d48541 |
8
.gitmodules
vendored
8
.gitmodules
vendored
@@ -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
|
||||
53
Dockerfile
53
Dockerfile
@@ -1,20 +1,55 @@
|
||||
FROM alpine:edge
|
||||
FROM alpine:3.21
|
||||
|
||||
# Install build dependencies
|
||||
# TODO: trim dependencies?
|
||||
RUN apk update && apk add \
|
||||
build-base \
|
||||
abuild \
|
||||
git \
|
||||
build-base abuild \
|
||||
rustup \
|
||||
build-base \
|
||||
musl-dev \
|
||||
gcc \
|
||||
cmake \
|
||||
make \
|
||||
pkgconfig \
|
||||
perl \
|
||||
python3 \
|
||||
curl \
|
||||
git \
|
||||
llvm \
|
||||
clang \
|
||||
clang-libclang \
|
||||
protobuf-dev \
|
||||
protobuf-dev \
|
||||
libmnl-dev \
|
||||
libnftnl-dev \
|
||||
dbus-dev \
|
||||
fontconfig-dev
|
||||
libc-dev \
|
||||
linux-headers \
|
||||
freetype-dev \
|
||||
freetype-static \
|
||||
fontconfig-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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -ex
|
||||
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"
|
||||
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
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
# Contributor:
|
||||
# Maintainer: Joakim Hulthe <joakim@hulthe.net>
|
||||
pkgname=mullvad-vpn-daemon
|
||||
pkgver=2026.1_git
|
||||
pkgrel=0
|
||||
pkgdesc="Mullvad VPN system service"
|
||||
url="https://mullvad.net/"
|
||||
arch="$(uname -m)"
|
||||
license="GPL-3-or-later"
|
||||
depends="
|
||||
"
|
||||
makedepends="
|
||||
build-base
|
||||
rustup
|
||||
musl-dev
|
||||
pkgconfig
|
||||
git
|
||||
protobuf-dev
|
||||
libmnl-dev
|
||||
libnftnl-dev
|
||||
dbus-dev
|
||||
"
|
||||
checkdepends=""
|
||||
# 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 !check suid"
|
||||
|
||||
_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
|
||||
|
||||
build() {
|
||||
# rustup-init -y --default-toolchain stable
|
||||
source "$HOME/.cargo/env"
|
||||
|
||||
cd "$startdir/mullvadvpn-app"
|
||||
|
||||
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
|
||||
|
||||
# * 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-daemon \
|
||||
-p mullvad-cli \
|
||||
-p mullvad-exclude \
|
||||
-p mullvad-problem-report
|
||||
}
|
||||
|
||||
package() {
|
||||
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
|
||||
|
||||
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
|
||||
|
||||
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/$target/release/mullvad-problem-report" \
|
||||
"$pkgdir"/usr/bin/mullvad-problem-report
|
||||
}
|
||||
|
||||
systemd() {
|
||||
install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \
|
||||
"$subpkgdir"/usr/lib/systemd/system/mullvad-daemon.service
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
|
||||
function remove_logs_and_cache {
|
||||
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"
|
||||
}
|
||||
|
||||
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
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu
|
||||
|
||||
ln -sf /opt/Mullvad\ VPN/resources/mullvad-problem-report /usr/bin/mullvad-problem-report
|
||||
|
||||
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"
|
||||
@@ -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
|
||||
|
||||
/opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || echo "Failed to reset firewall"
|
||||
/opt/Mullvad\ VPN/resources/mullvad-setup remove-device || echo "Failed to remove device from account"
|
||||
@@ -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
|
||||
/opt/Mullvad\ VPN/resources/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
|
||||
Submodule mullvad-vpn-daemon/mullvadvpn-app deleted from 27f4b02410
@@ -1,6 +1,6 @@
|
||||
# Contributor:
|
||||
# Maintainer: Joakim Hulthe <joakim@hulthe.net>
|
||||
pkgname=mullvad-vpn-slint
|
||||
# Maintainer:
|
||||
pkgname=mullvad-slint
|
||||
pkgver=2026.1_git
|
||||
pkgrel=0
|
||||
pkgdesc="Mullvad VPN GUI"
|
||||
@@ -9,24 +9,62 @@ arch="$(uname -m)"
|
||||
license="GPL-3-or-later"
|
||||
# TODO: maybe depend on mullvad-vpn-daemon?
|
||||
depends="
|
||||
freetype-dev
|
||||
freetype-static
|
||||
fontconfig-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
|
||||
"
|
||||
makedepends="
|
||||
build-base
|
||||
rustup
|
||||
build-base
|
||||
musl-dev
|
||||
gcc
|
||||
cmake
|
||||
make
|
||||
pkgconfig
|
||||
perl
|
||||
python3
|
||||
curl
|
||||
git
|
||||
llvm
|
||||
clang
|
||||
clang-libclang
|
||||
protobuf-dev
|
||||
fontconfig-dev
|
||||
dbus-dev
|
||||
libc-dev
|
||||
linux-headers
|
||||
"
|
||||
checkdepends=""
|
||||
install=""
|
||||
subpackages=""
|
||||
source=""
|
||||
builddir="$srcdir/"
|
||||
options="net !check"
|
||||
options="net"
|
||||
|
||||
_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
|
||||
|
||||
build() {
|
||||
# rustup-init -y --default-toolchain stable
|
||||
@@ -39,49 +77,22 @@ build() {
|
||||
|
||||
# * Force the `stable` toolchain since it's installed in the container.
|
||||
# We don't wan't to needlessly download rust while building.
|
||||
# * Disable `tray-icon` feature. (TODO: figure out how to compile with libdbus)
|
||||
# * Specify `--target` so that the final binary ends up in target/<target>/release.
|
||||
cargo +stable build --release --locked \
|
||||
--target "$target" \
|
||||
--no-default-features --features map \
|
||||
-p mullvad-slint
|
||||
}
|
||||
|
||||
package() {
|
||||
local cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
|
||||
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
|
||||
|
||||
# Executable
|
||||
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
|
||||
"$pkgdir"/usr/bin/mullvad-slint
|
||||
# TODO: .desktop
|
||||
# TODO: icon
|
||||
|
||||
# .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/icon_1_16x16x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/16x16/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_2_20x20x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/20x20/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_3_24x24x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/24x24/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_5_30x30x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/30x30/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_6_32x32x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/32x32/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_7_36x36x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/36x36/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_8_40x40x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/40x40/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_9_48x48x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/48x48/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_12_64x64x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/64x64/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_13_72x72x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/72x72/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_15_96x96x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/96x96/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_4_256x256x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/256x256/apps/mullvad.png
|
||||
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_10_512x512x32.png" \
|
||||
"$pkgdir"/usr/share/icons/hicolor/512x512/apps/mullvad.png
|
||||
install -m755 -D "$cargo_target_dir/$target/release/$pkgname" \
|
||||
"$pkgdir"/usr/bin/"$pkgname"
|
||||
}
|
||||
|
||||
|
||||
Submodule mullvad-vpn-slint/mullvadvpn-app deleted from 27f4b02410
5
podman-build.sh
Executable file → Normal file
5
podman-build.sh
Executable file → Normal file
@@ -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" \
|
||||
|
||||
Reference in New Issue
Block a user