it builds!

4 files changed, 35 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd8a79a3ce43..2109eff6d465 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn
 	pkgdesc = The Mullvad VPN client app for desktop
 	pkgver = 2019.9
-	pkgrel = 7
+	pkgrel = 8
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = mullvad-vpn
 	makedepends = git
 	makedepends = cargo
 	makedepends = npm
+	makedepends = rpm-org
 	depends = libnotify
 	depends = libappindicator-gtk3
 	depends = libxss
@@ -16,9 +17,11 @@ pkgbase = mullvad-vpn
 	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2019.9
 	source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git
 	source = mullvad-vpn.desktop
+	source = relays.json.tar.xz
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 121d90e6683e64d9c0d2dbb7b346fa918bdb37cf21fdaf9f66232304ed23abc2
+	sha256sums = 1d2c77dac7fefefc9a120781f7679731b046f82492a9e8dc447122bbf2973f10
 
 pkgname = mullvad-vpn
 
diff --git a/.gitignore b/.gitignore
index deb98c4cc516..ae0d3ce8085d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 !.SRCINFO
 !mullvad-vpn.desktop
 !mullvad-vpn.install
+!relays.json.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 21e4fa6f51bc..7717ef501ee7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,34 @@
 # Contributor: Matthew McGinn <mamcgi at gmail dot com>
 # Contributor: alicewww <almw at protonmail dot com>
 # Contributor: David Birks <david at tellus dot space>
+# Contributor: Linus Färnstrand <https://github.com/faern>
+# Contributor: Emīls Piņķis <https://github.com/pinkisemils>
+# Contributor: Andrej Mihajlov <https://github.com/pronebird>
 pkgname=mullvad-vpn
 pkgver=2019.9
-pkgrel=7
+pkgrel=8
 pkgdesc="The Mullvad VPN client app for desktop"
 url="https://www.mullvad.net"
 arch=('x86_64')
 license=('GPL3')
 depends=('libnotify' 'libappindicator-gtk3' 'libxss' 'nss')
-makedepends=('git' 'cargo' 'npm')
+makedepends=('git' 'cargo' 'npm' 'rpm-org')
 install="$pkgname.install"
 source=("git+https://github.com/mullvad/mullvadvpn-app.git#tag=$pkgver"
         'git+https://github.com/mullvad/mullvadvpn-app-binaries.git'
-        "$pkgname.desktop")
+        "$pkgname.desktop"
+        'relays.json.tar.xz') # file too large, had to compress
 sha256sums=('SKIP'
             'SKIP'
-            '121d90e6683e64d9c0d2dbb7b346fa918bdb37cf21fdaf9f66232304ed23abc2')
+            '121d90e6683e64d9c0d2dbb7b346fa918bdb37cf21fdaf9f66232304ed23abc2'
+            '1d2c77dac7fefefc9a120781f7679731b046f82492a9e8dc447122bbf2973f10')
 
 prepare() {
 	# Point the submodule to our local copy
 	cd "$srcdir/mullvadvpn-app"
 	git submodule init dist-assets/binaries
-	git config submodule.mullvadvpn-app-binaries.url "$srcdir/mullvadvpn-app-binaries"
+	git config submodule.mullvadvpn-app-binaries.url \
+		"$srcdir/mullvadvpn-app-binaries"
 	git submodule update
 }
 
@@ -33,6 +39,16 @@ build() {
 	# Build mullvad-daemon
 	cargo build --release --locked
 
+	# Copy binaries for packaging
+	cp dist-assets/binaries/x86_64-unknown-linux-gnu/{openvpn,sslocal} \
+		dist-assets/
+	cp target/release/*talpid_openvpn_plugin* dist-assets/
+	cp target/release/{mullvad,mullvad-daemon,mullvad-problem-report} \
+		dist-assets/
+
+	# TODO: Generate relays.json instead of copying it from .deb
+	cp "$srcdir/relays.json" dist-assets/
+
 	# Build Electron GUI app
 	cd gui
 	npm install --cache "$srcdir/npm-cache"
@@ -49,25 +65,30 @@ check() {
 
 package() {
 	cd "$srcdir/mullvadvpn-app"
+
+	# Install main files
 	install -dm755 "$pkgdir/opt/Mullvad VPN"
 	cp -a dist/linux-unpacked/* "$pkgdir/opt/Mullvad VPN"
 
-	install -Dm644 target/release/libtalpid_openvpn_plugin.so -t \
-		"$pkgdir/opt/Mullvad VPN/resources"
-	install -m755 target/release/{mullvad-daemon,mullvad-problem-report} -t \
-		"$pkgdir/opt/Mullvad VPN/resources"
+	# Install daemon service
 	install -Dm644 dist/linux-unpacked/resources/mullvad-daemon.service -t \
 		"$pkgdir/usr/lib/systemd/system"
+
+	#install CLI binary
 	install -Dm755 target/release/mullvad -t "$pkgdir/usr/bin"
 
+	# Link to the problem report binary
 	ln -s "/opt/Mullvad VPN/resources/mullvad-problem-report" \
 		"$pkgdir/usr/bin/mullvad-problem-report"
 
+	# Link to the GUI binary
 	ln -s "/opt/Mullvad VPN/mullvad-gui" "$pkgdir/usr/bin/$pkgname"
 
+	# Install desktop file from .deb
 	install -Dm644 "$srcdir/$pkgname.desktop" -t \
 		"$pkgdir/usr/share/applications"
 
+	# Install icons
 	for icon_size in 16 48; do
 		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
 		install -d $pkgdir/$icons_dir
diff --git a/relays.json.tar.xz b/relays.json.tar.xz
new file mode 100644
index 000000000000..1f527f74d7d8
--- /dev/null
+++ b/relays.json.tar.xz