From 3867f9acdc376e58fd0ebccbb5e8871b3be1fe25 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim.hulthe@mullvad.net>
Date: Fri, 24 Apr 2026 09:23:05 +0200
Subject: [PATCH] Don't generate relay list at build time

---
 mullvad-vpn-daemon/APKBUILD                    | 18 ++++++------------
 .../mullvad-vpn-daemon.post-install            |  7 ++++---
 .../mullvad-vpn-daemon.post-upgrade            |  7 ++++---
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD
index 22b1090..b2e0584 100644
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -25,9 +25,7 @@ makedepends="
 	libnftnl-dev
 "
 install="
-	$pkgname.post-install
 	$pkgname.pre-upgrade
-	$pkgname.post-upgrade
 	$pkgname.pre-deinstall
 	$pkgname.post-deinstall
 	$pkgname-systemd.post-install
@@ -51,12 +49,6 @@ prepare() {
 	default_prepare
 
 	cargo fetch --target "$CHOST" --locked
-
-	# Generate vendored relay list
-	cargo run --frozen \
-		-p mullvad-api --bin relay_list \
-		--target "$CHOST" \
-		> "$builddir/relays.json"
 }
 
 build() {
@@ -90,10 +82,12 @@ package() {
 	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"
+	# TODO: Bundle a relay list.
+	# We can't generate one at build time since that would break build reproducibility.
+	# Once mullvad starts checking a relay list into their release branches, we can bundle that.
+	#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() {
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
index 38c0115..20e48d6 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -eu
 
+# TODO: see `package()` in APKBUILD
 # Copy vendored relay list into place
-mkdir -p /var/cache/mullvad-vpn \
-  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
-  || echo "failed to install /var/cache/mullvad-vpn/relays.json"
+# mkdir -p /var/cache/mullvad-vpn \
+#   && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+#   || echo "failed to install /var/cache/mullvad-vpn/relays.json"
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
index e00ead1..f8dd2fe 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -eu
 
+# TODO: see `package()` in APKBUILD
 # Overwrite the cached relay list with the vendored one.
-mkdir -p /var/cache/mullvad-vpn \
-  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
-  || echo "failed to install /var/cache/mullvad-vpn/relays.json"
+# mkdir -p /var/cache/mullvad-vpn \
+#   && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+#   || echo "failed to install /var/cache/mullvad-vpn/relays.json"