2020.6

3 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fb0d16d9eec..d046ba675bf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mullvad-vpn-bin
 	pkgdesc = The Mullvad VPN client app for desktop
-	pkgver = 2020.5
+	pkgver = 2020.6
 	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
@@ -12,11 +12,11 @@ pkgbase = mullvad-vpn-bin
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.5/MullvadVPN-2020.5_amd64.deb
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.5/MullvadVPN-2020.5_amd64.deb.asc
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.6/MullvadVPN-2020.6_amd64.deb
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.6/MullvadVPN-2020.6_amd64.deb.asc
 	source = mullvad-vpn.sh
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	sha256sums = 760b1482e20d4064e3da20575950783d7ce10e092e386154b1ac737929363f8c
+	sha256sums = 2353c817abd026e3061cdfa30fb41ac304ec2cf0b3057aaf34a86f450eda3935
 	sha256sums = SKIP
 	sha256sums = a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4
 
diff --git a/PKGBUILD b/PKGBUILD
index 83b5e08dec38..1ddead3b56d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Matthew McGinn <mamcgi at gmail dot com>
 # Contributor: alicewww <almw at protonmail dot com>
 pkgname=mullvad-vpn-bin
-pkgver=2020.5
+pkgver=2020.6
 pkgrel=1
 pkgdesc="The Mullvad VPN client app for desktop"
 url="https://www.mullvad.net"
@@ -14,13 +14,13 @@ conflicts=("${pkgname%-bin}")
 install="${pkgname%-bin}.install"
 source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$pkgver/MullvadVPN-${pkgver}_amd64.deb"{,.asc}
         "${pkgname%-bin}.sh")
-sha256sums=('760b1482e20d4064e3da20575950783d7ce10e092e386154b1ac737929363f8c'
+sha256sums=('2353c817abd026e3061cdfa30fb41ac304ec2cf0b3057aaf34a86f450eda3935'
             'SKIP'
             'a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4')
 validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin at mullvad dot net>
 
 package() {
-	tar -xvf data.tar.xz -C "$pkgdir"
+	bsdtar -xvf data.tar.xz -C "$pkgdir"
 
 	# Link to the GUI binary
 	install -m755 "$srcdir/${pkgname%-bin}.sh" "$pkgdir/usr/bin/${pkgname%-bin}"
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
index 95ec59694b77..b348092ea0fc 100644
--- a/mullvad-vpn.install
+++ b/mullvad-vpn.install
@@ -5,14 +5,16 @@ pre_install() {
 		systemctl disable --now mullvad-daemon
 	fi
 
+	pkill -x "mullvad-gui" || true
+
 	rm -f /var/cache/mullvad-vpn/relays.json || true
 }
 
 post_install() {
+	chmod u+s "/usr/bin/mullvad-exclude"
+
 	echo 'Enabling Mullvad VPN daemon...'
 	systemctl enable --now mullvad-daemon
-
-	chmod u+s "/usr/bin/mullvad-exclude"
 }
 
 pre_upgrade() {
@@ -28,10 +30,14 @@ post_upgrade() {
 }
 
 pre_remove() {
+	/usr/bin/mullvad account clear-history || echo "Failed to remove leftover WireGuard keys"
+
 	# the user might've disabled or stopped the service themselves already
 	echo 'Making sure the Mullvad VPN daemon is stopped & disabled...'
 	systemctl stop mullvad-daemon || true
 	systemctl disable mullvad-daemon || true
+
+	/opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || true
 }
 
 post_remove() {