diff options
| author | Timo Kramer | 2020-05-12 15:13:02 +0200 |
|---|---|---|
| committer | Timo Kramer | 2020-05-12 15:13:02 +0200 |
| commit | ac37b402d0088a0aeb762bf338ddd94466a84143 (patch) | |
| tree | c2ae1ab7c74595bc99fdec508fad444dc0e1f572 | |
| parent | f3c1661e5251abe26be5af2f717b2d7c41dbc54a (diff) | |
| download | aur-ac37b402d0088a0aeb762bf338ddd94466a84143.tar.gz | |
2020.4
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 15 |
2 files changed, 6 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = mullvad-vpn-cli pkgdesc = The Mullvad VPN client cli - pkgver = 2020.3 + pkgver = 2020.4 pkgrel = 1 url = https://www.mullvad.net install = mullvad-vpn-cli.install @@ -9,10 +9,9 @@ pkgbase = mullvad-vpn-cli makedepends = git makedepends = cargo makedepends = go-pie - makedepends = jq depends = nss conflicts = mullvad-vpn - source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2020.3?signed + source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2020.4?signed source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=90b0c06b59a0b9d6cda69924377335f39854b216?signed source = override.conf source = settings.json.sample @@ -1,14 +1,14 @@ # Maintainer: Timo Kramer <fw minus aur at timokramer dot de> pkgname=mullvad-vpn-cli -pkgver=2020.3 +pkgver=2020.4 pkgrel=1 pkgdesc="The Mullvad VPN client cli" url="https://www.mullvad.net" arch=('x86_64') license=('GPL3') depends=('nss') -makedepends=('git' 'cargo' 'go-pie' 'jq') +makedepends=('git' 'cargo' 'go-pie') conflicts=('mullvad-vpn') install="${pkgname}.install" _commit='90b0c06b59a0b9d6cda69924377335f39854b216' @@ -36,7 +36,7 @@ prepare() { build() { # Build wireguard-go - cd "$srcdir/mullvadvpn-app/wireguard/wireguard-go" + cd "$srcdir/mullvadvpn-app/wireguard/libwg" mkdir -p "../../build/lib/$arch-unknown-linux-gnu" go build \ -trimpath \ @@ -63,11 +63,7 @@ build() { done # Update relays.json - curl --request POST \ - --fail \ - --header "Content-Type: application/json" \ - --data '{"jsonrpc": "2.0", "id": "0", "method": "relay_list_v3"}' \ - https://api.mullvad.net/rpc/ | jq --indent 4 '.result' > ../relays.json + cargo run -p mullvad-rpc --bin relay_list > dist-assets/relays.json } check() { @@ -96,9 +92,6 @@ package() { # Install settings.json install --verbose -D --mode=644 "${srcdir}/settings.json.sample" -t "${pkgdir}/etc/mullvad-vpn" - # Install relays.json - install --verbose -D --mode=644 "${srcdir}/relays.json" -t "${pkgdir}/var/cache/mullvad-vpn" - # Install license install --verbose -D --mode=644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |