Update to 7.0.0.0018

4 files changed, 60 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50f7cbc049d0..d68ce5b43c33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = forticlient-vpn
 	pkgdesc = Build through the official package of FortiClient VPN
-	pkgver = 6.4.3.0959
+	pkgver = 7.0.0.0018
 	pkgrel = 1
-	url = https://forticlient.com/
+	url = https://www.fortinet.com/support/product-downloads
 	install = forticlient-vpn.install
 	arch = x86_64
 	license = custom:fortinet
@@ -13,17 +13,17 @@ pkgbase = forticlient-vpn
 	depends = openssl
 	depends = libnotify
 	depends = org.freedesktop.secrets
-	optdepends = libappindicator-gtk2: for show trayicon
-	optdepends = mate-polkit: for polkit authentication
-	optdepends = polkit-gnome: for polkit authentication
-	optdepends = polkit-kde-agent: for polkit authentication
-	optdepends = deepin-polkit-agent: for polkit authentication
-	optdepends = pantheon-polkit-agent: for polkit authentication
-	optdepends = lxqt-policykit: for polkit authentication
+	depends = libappindicator-gtk2
+	optdepends = mate-polkit: for polkit authentication for the MATE
+	optdepends = polkit-gnome: for polkit authentication for the GNOME
+	optdepends = polkit-kde-agent: for polkit authentication for the KDE
+	optdepends = deepin-polkit-agent: for polkit authentication for the Deepin
+	optdepends = pantheon-polkit-agent: for polkit authentication for the Pantheon
+	optdepends = lxqt-policykit: for polkit authentication for the LXQt
 	provides = fortivpn
 	provides = FortiClient
-	source = https://fortinetweb.s3.amazonaws.com/forticlient/downloads/FortiClientFullVPNInstaller_6.4.3.0959_amd64.deb
-	sha256sums = 728a416b93ff4944b9c1d5974ac29eefad2d5fca33efd48a2967db23fd7450ea
+	source = https://filestore.fortinet.com/forticlient/downloads/forticlient_vpn_7.0.0.0018_amd64.deb
+	sha256sums = 82e5817048a60ff95d2e88b4a95512f9f0035fa37240ce57580c203b5a8a79c9
 
 pkgname = forticlient-vpn
 
diff --git a/PKGBUILD b/PKGBUILD
index eb71c802460f..7c7010f22d00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,24 @@
 # Maintainer: Douglas Iuri Medeiros Cabral <douglasimc at outlook dot com>
 pkgname=forticlient-vpn
-pkgver=6.4.3.0959
+pkgver=7.0.0.0018
 pkgrel=1
 pkgdesc="Build through the official package of FortiClient VPN"
 arch=("x86_64")
-url="https://forticlient.com/"
+url="https://www.fortinet.com/support/product-downloads"
 license=('custom:fortinet')
-depends=('nss' 'gtk3' 'libxss' 'polkit' 'openssl' 'libnotify' 'org.freedesktop.secrets')
+depends=('nss' 'gtk3' 'libxss' 'polkit' 'openssl' 'libnotify' 'org.freedesktop.secrets' 'libappindicator-gtk2')
 optdepends=(
-	'libappindicator-gtk2: for show trayicon'
-	'mate-polkit: for polkit authentication'
-	'polkit-gnome: for polkit authentication'
-	'polkit-kde-agent: for polkit authentication'
-	'deepin-polkit-agent: for polkit authentication'
-	'pantheon-polkit-agent: for polkit authentication'
-	'lxqt-policykit: for polkit authentication'
+	'mate-polkit: for polkit authentication for the MATE'
+	'polkit-gnome: for polkit authentication for the GNOME'
+	'polkit-kde-agent: for polkit authentication for the KDE'
+	'deepin-polkit-agent: for polkit authentication for the Deepin'
+	'pantheon-polkit-agent: for polkit authentication for the Pantheon'
+	'lxqt-policykit: for polkit authentication for the LXQt'
 )
 provides=('fortivpn' 'FortiClient')
 install='forticlient-vpn.install'
-source=("https://fortinetweb.s3.amazonaws.com/forticlient/downloads/FortiClientFullVPNInstaller_${pkgver}_amd64.deb")
-sha256sums=('728a416b93ff4944b9c1d5974ac29eefad2d5fca33efd48a2967db23fd7450ea')
+source=("https://filestore.fortinet.com/forticlient/downloads/forticlient_vpn_${pkgver}_amd64.deb")
+sha256sums=('82e5817048a60ff95d2e88b4a95512f9f0035fa37240ce57580c203b5a8a79c9')
 
 
 package() {
diff --git a/forticlient-vpn.changelog b/forticlient-vpn.changelog
index 6155a3e75256..1e100f12badf 100644
--- a/forticlient-vpn.changelog
+++ b/forticlient-vpn.changelog
@@ -1,7 +1,12 @@
+## forticlient-vpn - 7.0.0.0018 - 2021-06-13
+* forticlient-vpn - 7.0.0.0018 - `release 1`
+  + libappindicator-gtk2 moved to `depends`
+  + added message to restore config after upgrade
+
 ## forticlient-vpn - 6.4.3.0959 - 2021-04-07
-* `release 1`
-  + add `depends`, `optdepends`, `install` and `changelog` to PKGBUILD
-  + included symbolyc launchers to /etc/xdg/autostart
-  + alter symbolyc binary to lowercase 
-  + add `forticlient-vpn.install` to tree
-  + add `forticlient-vpn.changelog` to tree
+* forticlient-vpn - 6.4.3.0959 - `release 1`
+  + added `depends`, `optdepends`, `install` and `changelog` to PKGBUILD
+  + symbolyc launchers included into /etc/xdg/autostart
+  + symbolyc binary altered to lowercase 
+  + added `forticlient-vpn.install` to tree
+  + added `forticlient-vpn.changelog` to tree
diff --git a/forticlient-vpn.install b/forticlient-vpn.install
index 3764525ae89f..69523045c905 100644
--- a/forticlient-vpn.install
+++ b/forticlient-vpn.install
@@ -95,6 +95,19 @@ post_install() {
 	if [ -f /usr/share/icons/hicolor/48x48/apps/forticlient.png ]; then
 	    gtk-update-icon-cache -f /usr/share/icons/hicolor || true
 	fi
+	
+	# Setup forticlient protocol handler
+	if [ -f /usr/share/applications/forticlient-register.desktop ]; then
+	    update-desktop-database
+	fi
+}
+
+post_upgrade() {
+cat << EOF
+
+==> After upgrade, to restore your config, copy XML file from /etc/forticlient/.old/ to /etc/forticlient/config.xml
+
+EOF
 }
 
 pre_remove() {
@@ -109,11 +122,25 @@ pre_remove() {
 	    echo "terminate" > /tmp/.forticlient/fortitraylauncher || true
 	fi
 
+	# Remove ZTNA browser certificates
+	if [ -f /usr/bin/certutil ]; then
+	    find /home /root -regextype posix-extended \
+		-regex '(/home/[^/]*|/root)/(.pki/nssdb|.mozilla/firefox/[^/]*default(-release)?)' \
+		-maxdepth 5 -print0 2>/dev/null |
+	    while IFS= read -r -d $'\0' p; do
+		/usr/bin/certutil -F -n FCT_ZTNA    -d sql:"$p" 2>/dev/null || true;
+		/usr/bin/certutil -D -n FCT_ZTNA_CA -d sql:"$p" 2>/dev/null || true;
+	    done
+	fi
+
 	pkill -f /opt/forticlient
 	exit 0
 }
 
 post_remove() {
+	# Remove shared memory
+	rm -rf /var/run/fctc.s || true
+
 	# Remove fortitraylauncher fifo
 	rm -rf /tmp/.forticlient/fortitraylauncher || true
 }