Compare commits
8 Commits
2026.1-dev
...
d695ad5ed3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d695ad5ed3 | ||
| d2a1e43957 | |||
| f34b7bed2f | |||
| 6446528e83 | |||
| 0bdc5be782 | |||
| f4d15b8604 | |||
|
|
ddb3ed3699 | ||
|
|
16c9d48541 |
1
.dockerignore
Normal file
1
.dockerignore
Normal file
@@ -0,0 +1 @@
|
|||||||
|
*
|
||||||
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
packages/*
|
||||||
|
!packages/.gitkeep
|
||||||
|
target/*
|
||||||
|
!target/.gitkeep
|
||||||
29
Dockerfile
Normal file
29
Dockerfile
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
FROM alpine:edge
|
||||||
|
|
||||||
|
# Install build dependencies
|
||||||
|
# TODO: trim dependencies?
|
||||||
|
RUN apk update && apk add \
|
||||||
|
build-base \
|
||||||
|
abuild \
|
||||||
|
git \
|
||||||
|
rustup \
|
||||||
|
musl-dev \
|
||||||
|
pkgconfig \
|
||||||
|
protobuf-dev \
|
||||||
|
protobuf-dev \
|
||||||
|
libmnl-dev \
|
||||||
|
libnftnl-dev \
|
||||||
|
dbus-dev \
|
||||||
|
fontconfig-dev
|
||||||
|
|
||||||
|
RUN rustup-init -y --default-toolchain stable
|
||||||
|
|
||||||
|
# Set pkg-config to use static libraries
|
||||||
|
ENV PKG_CONFIG_ALLOW_STATIC=1
|
||||||
|
ENV PKG_CONFIG_ALL_STATIC=1
|
||||||
|
|
||||||
|
# Slint/winit does not work when statically compiled
|
||||||
|
ENV RUSTFLAGS="-C target-feature=-crt-static"
|
||||||
|
|
||||||
|
WORKDIR /build
|
||||||
|
|
||||||
21
README.md
Normal file
21
README.md
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# Alpine packages for mullvad-vpn
|
||||||
|
|
||||||
|
## Setup
|
||||||
|
|
||||||
|
1. Install `abuild`
|
||||||
|
2. Create keys: `abuild-keygen`
|
||||||
|
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
|
||||||
|
|
||||||
|
```
|
||||||
|
./podman-build.sh ./mullvad-vpn-slint
|
||||||
|
```
|
||||||
|
|
||||||
|
## Updating
|
||||||
|
|
||||||
|
1. Update submodule
|
||||||
|
2. Either update `pkgver`. If so, set `pkgrel` to 0,
|
||||||
|
or bump `pkgrel` by 1.
|
||||||
|
3. `git commit -m "update packages"`
|
||||||
1
abuild.conf
Normal file
1
abuild.conf
Normal file
@@ -0,0 +1 @@
|
|||||||
|
PACKAGER_PRIVKEY="/key.rsa"
|
||||||
23
docker-build.sh
Executable file
23
docker-build.sh
Executable file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
package="$1"
|
||||||
|
builder_image="mullvad-slint-musl-builder"
|
||||||
|
. "$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 ./target:/cargo-target \
|
||||||
|
-v ./packages:/root/packages \
|
||||||
|
-e "CARGO_TARGET_DIR=/cargo-target" \
|
||||||
|
-it \
|
||||||
|
"$builder_image" \
|
||||||
|
abuild -F
|
||||||
|
|
||||||
73
mullvad-vpn-daemon/APKBUILD
Normal file
73
mullvad-vpn-daemon/APKBUILD
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
# 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
|
||||||
|
}
|
||||||
57
mullvad-vpn-slint/APKBUILD
Normal file
57
mullvad-vpn-slint/APKBUILD
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
# Contributor:
|
||||||
|
# Maintainer: Joakim Hulthe <joakim@hulthe.net>
|
||||||
|
pkgname=mullvad-vpn-slint
|
||||||
|
pkgver=2026.1_git
|
||||||
|
pkgrel=0
|
||||||
|
pkgdesc="Mullvad VPN GUI"
|
||||||
|
url="https://mullvad.net/"
|
||||||
|
arch="$(uname -m)"
|
||||||
|
license="GPL-3-or-later"
|
||||||
|
# TODO: maybe depend on mullvad-vpn-daemon?
|
||||||
|
depends="
|
||||||
|
"
|
||||||
|
makedepends="
|
||||||
|
build-base
|
||||||
|
rustup
|
||||||
|
musl-dev
|
||||||
|
pkgconfig
|
||||||
|
protobuf-dev
|
||||||
|
fontconfig-dev
|
||||||
|
dbus-dev
|
||||||
|
"
|
||||||
|
checkdepends=""
|
||||||
|
install=""
|
||||||
|
subpackages=""
|
||||||
|
source=""
|
||||||
|
builddir="$srcdir/"
|
||||||
|
options="net !check"
|
||||||
|
|
||||||
|
_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"
|
||||||
|
|
||||||
|
# rustup default stable
|
||||||
|
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-slint
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
|
||||||
|
|
||||||
|
# TODO: .desktop
|
||||||
|
# TODO: icon
|
||||||
|
|
||||||
|
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
|
||||||
|
"$pkgdir"/usr/bin/mullvad-slint
|
||||||
|
}
|
||||||
|
|
||||||
0
packages/.gitkeep
Normal file
0
packages/.gitkeep
Normal file
23
podman-build.sh
Executable file
23
podman-build.sh
Executable file
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
package="$1"
|
||||||
|
builder_image="mullvad-slint-musl-builder"
|
||||||
|
. "$HOME/.abuild/abuild.conf"
|
||||||
|
|
||||||
|
podman build . -f Dockerfile -t "$builder_image"
|
||||||
|
podman 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 ./target:/cargo-target \
|
||||||
|
-v ./packages:/root/packages \
|
||||||
|
-e "CARGO_TARGET_DIR=/cargo-target" \
|
||||||
|
-it \
|
||||||
|
"$builder_image" \
|
||||||
|
abuild -F
|
||||||
|
|
||||||
0
target/.gitkeep
Normal file
0
target/.gitkeep
Normal file
Reference in New Issue
Block a user