diff --git a/.gitmodules b/.gitmodules index 6bf8f92..59a6328 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,3 @@ 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 diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD index 3be3d2f..52b83a2 100644 --- a/mullvad-vpn-daemon/APKBUILD +++ b/mullvad-vpn-daemon/APKBUILD @@ -1,8 +1,8 @@ # Contributor: # Maintainer: Joakim Hulthe pkgname=mullvad-vpn-daemon -pkgver=2026.1_git -pkgrel=5 +pkgver=2026.2_beta1 +pkgrel=1 pkgdesc="Mullvad VPN system service" url="https://mullvad.net/" arch="all" @@ -37,22 +37,25 @@ subpackages=" $pkgname-systemd $pkgname-suid " -source="" -builddir="$srcdir/" +source=" + https://github.com/mullvad/mullvadvpn-app/archive/refs/tags/2026.2-beta1.tar.gz +" +sha512sums=" + 9af0c263f0e5985d7842099f50a5070da0b23691f08ffe57c3b6d239d2c1c9acea89c07890f31d89bd75448a2dd1fd3c878b85be458baba0bcd90760e714b032 2026.2-beta1.tar.gz +" +builddir="$srcdir/mullvadvpn-app-2026.2-beta1/" options="net suid" -_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}" +_cargo_target_dir="${CARGO_TARGET_DIR:-$builddir/target}" +_cargo_release_dir="$_cargo_target_dir/$CHOST/release" prepare() { default_prepare - cd "$startdir/mullvadvpn-app" cargo fetch --target "$CHOST" --locked } build() { - cd "$startdir/mullvadvpn-app" - # Specify `--target` so that the build artifacts ends up in target//release to # avoid clashes with host system when running in a container with a mounted target folder. @@ -73,26 +76,25 @@ build() { } check() { - cd "$startdir/mullvadvpn-app" cargo test --target "$CHOST" --frozen } package() { - install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad" \ - "$pkgdir"/usr/bin/mullvad + install -m755 -D "$_cargo_release_dir/mullvad" \ + "$pkgdir/usr/bin/mullvad" - install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-daemon" \ - "$pkgdir"/usr/bin/mullvad-daemon + install -m755 -D "$_cargo_release_dir/mullvad-daemon" \ + "$pkgdir/usr/bin/mullvad-daemon" - install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-problem-report" \ - "$pkgdir"/usr/bin/mullvad-problem-report + install -m755 -D "$_cargo_release_dir/mullvad-problem-report" \ + "$pkgdir/usr/bin/mullvad-problem-report" - install -m755 -D "$_cargo_target_dir/$CHOST/release/mullvad-setup" \ - "$pkgdir"/usr/bin/mullvad-setup + install -m755 -D "$_cargo_release_dir/mullvad-setup" \ + "$pkgdir/usr/bin/mullvad-setup" # Bundle the vendored relay list. It's copied to /var/cache/mullvad-vpn/ by the post-* scripts. install -m644 -D "$builddir/relays.json" \ - "$pkgdir"/usr/share/mullvad-vpn/relays.json + "$pkgdir/usr/share/mullvad-vpn/relays.json" } systemd() { @@ -100,16 +102,16 @@ systemd() { depends="$pkgname=$pkgver-r$pkgrel" install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \ - "$subpkgdir"/usr/lib/systemd/system/mullvad-daemon.service + "$subpkgdir/usr/lib/systemd/system/mullvad-daemon.service" install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-early-boot-blocking.service" \ - "$subpkgdir"/usr/lib/systemd/system/mullvad-early-boot-blocking.service + "$subpkgdir/usr/lib/systemd/system/mullvad-early-boot-blocking.service" } suid() { pkgdesc="mullvad-exclude cli for split tunneling" depends="$pkgname=$pkgver-r$pkgrel" - install -m4755 -D "$_cargo_target_dir/$CHOST/release/mullvad-exclude" \ - "$subpkgdir"/usr/bin/mullvad-exclude + install -m4755 -D "$_cargo_release_dir/mullvad-exclude" \ + "$subpkgdir/usr/bin/mullvad-exclude" } diff --git a/mullvad-vpn-daemon/mullvadvpn-app b/mullvad-vpn-daemon/mullvadvpn-app deleted file mode 160000 index 236bbc4..0000000 --- a/mullvad-vpn-daemon/mullvadvpn-app +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 236bbc4c0e68b2f38a9327f0bde814183f750e80