Compare commits
2 Commits
3f915b3120
...
3867f9acdc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3867f9acdc | ||
|
|
71776145db |
@@ -4,7 +4,9 @@ pkgver=2026.2_beta1
|
|||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Mullvad VPN client (daemon and CLI)"
|
pkgdesc="Mullvad VPN client (daemon and CLI)"
|
||||||
url="https://mullvad.net/"
|
url="https://mullvad.net/"
|
||||||
arch="all"
|
# Mullvad depends on old versions of the `nix` library
|
||||||
|
# which are broken on on loongarch64 and s390x
|
||||||
|
arch="all !loongarch64 !s390x"
|
||||||
license="GPL-3-or-later"
|
license="GPL-3-or-later"
|
||||||
depends="
|
depends="
|
||||||
dbus
|
dbus
|
||||||
@@ -23,9 +25,7 @@ makedepends="
|
|||||||
libnftnl-dev
|
libnftnl-dev
|
||||||
"
|
"
|
||||||
install="
|
install="
|
||||||
$pkgname.post-install
|
|
||||||
$pkgname.pre-upgrade
|
$pkgname.pre-upgrade
|
||||||
$pkgname.post-upgrade
|
|
||||||
$pkgname.pre-deinstall
|
$pkgname.pre-deinstall
|
||||||
$pkgname.post-deinstall
|
$pkgname.post-deinstall
|
||||||
$pkgname-systemd.post-install
|
$pkgname-systemd.post-install
|
||||||
@@ -49,12 +49,6 @@ prepare() {
|
|||||||
default_prepare
|
default_prepare
|
||||||
|
|
||||||
cargo fetch --target "$CHOST" --locked
|
cargo fetch --target "$CHOST" --locked
|
||||||
|
|
||||||
# Generate vendored relay list
|
|
||||||
cargo run --frozen \
|
|
||||||
-p mullvad-api --bin relay_list \
|
|
||||||
--target "$CHOST" \
|
|
||||||
> "$builddir/relays.json"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
@@ -88,10 +82,12 @@ package() {
|
|||||||
install -m755 -D "$_cargo_release_dir/mullvad-setup" \
|
install -m755 -D "$_cargo_release_dir/mullvad-setup" \
|
||||||
"$pkgdir/usr/bin/mullvad-setup"
|
"$pkgdir/usr/bin/mullvad-setup"
|
||||||
|
|
||||||
# Bundle the vendored relay list.
|
# TODO: Bundle a relay list.
|
||||||
# It's copied to /var/cache/mullvad-vpn/ by the post-* scripts.
|
# We can't generate one at build time since that would break build reproducibility.
|
||||||
install -m644 -D "$builddir/relays.json" \
|
# Once mullvad starts checking a relay list into their release branches, we can bundle that.
|
||||||
"$pkgdir/usr/share/mullvad-vpn/relays.json"
|
#install -m644 -D "$builddir/<todo>/relays.json" \
|
||||||
|
# "$pkgdir/usr/share/mullvad-vpn/relays.json"
|
||||||
|
# TODO: Copy relay list into /var/cache/ in post-upgrade/post-install
|
||||||
}
|
}
|
||||||
|
|
||||||
systemd() {
|
systemd() {
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
# TODO: see `package()` in APKBUILD
|
||||||
# Copy vendored relay list into place
|
# Copy vendored relay list into place
|
||||||
mkdir -p /var/cache/mullvad-vpn \
|
# mkdir -p /var/cache/mullvad-vpn \
|
||||||
&& cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
|
# && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
|
||||||
|| echo "failed to install /var/cache/mullvad-vpn/relays.json"
|
# || echo "failed to install /var/cache/mullvad-vpn/relays.json"
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
# TODO: see `package()` in APKBUILD
|
||||||
# Overwrite the cached relay list with the vendored one.
|
# Overwrite the cached relay list with the vendored one.
|
||||||
mkdir -p /var/cache/mullvad-vpn \
|
# mkdir -p /var/cache/mullvad-vpn \
|
||||||
&& cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
|
# && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
|
||||||
|| echo "failed to install /var/cache/mullvad-vpn/relays.json"
|
# || echo "failed to install /var/cache/mullvad-vpn/relays.json"
|
||||||
|
|||||||
Reference in New Issue
Block a user