Version bumped to 5.1.3

Before upgrading from v5.0 you need to know that now you need to receive a
profile which you paste into Appgate, the old method of providing the endpoint
and accepting a certificate then logging in with username and password is not
present in v5.1.

Added patch /opt/appgate/linux/set_dns by megapoliss
Added python-dbus as a dependency (thanks wreck)
Added gnome-keyring as an optional dependency (thanks wreck)
Updated the nm.py.patch
Updated the download link

4 files changed, 48 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfe6d640ea81..fb2ea1728f71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = appgate-sdp-5
 	pkgdesc = Software Defined Perimeter v5 - GUI client
-	pkgver = 5.0.3
+	pkgver = 5.1.2
 	pkgrel = 1
 	url = https://www.cyxtera.com/essential-defense/appgate-sdp/support
 	arch = x86_64
@@ -13,15 +13,19 @@ pkgbase = appgate-sdp-5
 	depends = libxss
 	depends = nodejs
 	depends = dnsmasq
+	depends = python-dbus
+	optdepends = gnome-keyring: saves the endpoint certificate between sessions
 	conflicts = appgate-sdp-headless
 	conflicts = appgate-sdp
 	options = staticlibs
-	source = https://sdpdownloads.cyxtera.com/AppGate-SDP-5.0/clients/appgate-sdp_5.0.3_amd64.deb
+	source = https://bin.appgate-sdp.com/5.1/client/appgate-sdp_5.1.2_amd64.deb
 	source = appgatedriver.service
 	source = nm.py.patch
-	md5sums = 1ffc310a4aea80fb8574f7d3eaa611ec
+	source = set_dns.patch
+	md5sums = cdea9f4f5ff4184b999ae0ed4d0c9b93
 	md5sums = 002644116e20b2d79fdb36b7677ab4cf
-	md5sums = c36c11d995cc341f2f1eb4c3b6afa732
+	md5sums = 4b299aebb57019c6a4f70860da454300
+	md5sums = aa95ad0ba9304cf72ee43779cd28d9a5
 
 pkgname = appgate-sdp-5
 
diff --git a/PKGBUILD b/PKGBUILD
index 11d2d4be6e7d..e915e3710e34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Pawel Mosakowski <pawel at mosakowski dot net>
 pkgname=appgate-sdp-5
 conflicts=('appgate-sdp-headless' 'appgate-sdp')
-pkgver=5.0.3
+pkgver=5.1.2
 _download_pkgver=$(expr match "$pkgver" '\([[:digit:]]\+\.[[:digit:]]\+\)')
 _download_pkgname='appgate-sdp'
 pkgrel=1
@@ -12,10 +12,12 @@ url="https://www.cyxtera.com/essential-defense/appgate-sdp/support"
 license=('custom')
 
 # dependecies calculated by namcap
-depends=('gconf' 'libsecret' 'gtk3' 'python' 'nss' 'libxss' 'nodejs' 'dnsmasq')
-source=("https://sdpdownloads.cyxtera.com/AppGate-SDP-${_download_pkgver}/clients/${_download_pkgname}_${pkgver}_amd64.deb"
+depends=('gconf' 'libsecret' 'gtk3' 'python' 'nss' 'libxss' 'nodejs' 'dnsmasq' 'python-dbus')
+optdepends=('gnome-keyring: saves the endpoint certificate between sessions')
+source=("https://bin.appgate-sdp.com/${_download_pkgver}/client/${_download_pkgname}_${pkgver}_amd64.deb"
         "appgatedriver.service"
-        "nm.py.patch")
+        "nm.py.patch"
+        "set_dns.patch")
 
 options=(staticlibs)
 
@@ -30,12 +32,15 @@ package() {
 
     cp -v "$srcdir/appgatedriver.service" "$pkgdir/usr/lib/systemd/system/appgatedriver.service"
     patch "$pkgdir/opt/appgate/linux/nm.py" "$srcdir/nm.py.patch"
+    patch "$pkgdir/opt/appgate/linux/set_dns" "$srcdir/set_dns.patch"
 
     mkdir -vp "$pkgdir/usr/share/licenses/appgate-sdp"
     cp -v "$pkgdir/usr/share/doc/appgate/copyright" "$pkgdir/usr/share/licenses/appgate-sdp"
     cp -v "$pkgdir/usr/share/doc/appgate/LICENSE.github" "$pkgdir/usr/share/licenses/appgate-sdp"
     cp -v "$pkgdir/usr/share/doc/appgate/LICENSES.chromium.html.bz2" "$pkgdir/usr/share/licenses/appgate-sdp"
 }
-md5sums=('1ffc310a4aea80fb8574f7d3eaa611ec'
+
+md5sums=('cdea9f4f5ff4184b999ae0ed4d0c9b93'
          '002644116e20b2d79fdb36b7677ab4cf'
-         'c36c11d995cc341f2f1eb4c3b6afa732')
+         '4b299aebb57019c6a4f70860da454300'
+         'aa95ad0ba9304cf72ee43779cd28d9a5')
diff --git a/nm.py.patch b/nm.py.patch
index ddb842f3dc8b..7dab1dabab56 100644
--- a/nm.py.patch
+++ b/nm.py.patch
@@ -1,12 +1,10 @@
---- ./opt/appgate/linux/nm.py.before	2020-03-17 11:43:13.875718603 +0000
-+++ ./opt/appgate/linux/nm.py	2020-03-17 11:44:42.565719740 +0000
-@@ -271,8 +271,10 @@
-     if _bus_exists('uk.org.thekelleys.dnsmasq', '/'):
+--- nm.py-5.1.3.orig	2020-06-03 18:30:33.236358565 +0100
++++ nm.py-5.1.3.arch	2020-06-03 18:30:17.606358578 +0100
+@@ -276,7 +276,9 @@
          syslog(LOG_INFO, '[has_system_dnsmasq] dnsmasq bus present')
          return True
--
--    if platform.linux_distribution()[0] != 'Fedora':
-+    
+ 
+-    if distro.linux_distribution()[0] != 'Fedora':
 +    # this is PKGBUILD for Arch so this check should always yield True
 +    # if platform.linux_distribution()[0] != 'Fedora':
 +    if True:
diff --git a/set_dns.patch b/set_dns.patch
new file mode 100644
index 000000000000..798bacc6aa66
--- /dev/null
+++ b/set_dns.patch
@@ -0,0 +1,24 @@
+--- /opt/appgate/linux/set_dns.old	2020-01-28 13:01:21.000000000 +0200
++++ /opt/appgate/linux/set_dns	2020-04-02 14:55:09.384265001 +0300
+@@ -175,10 +175,10 @@
+ def reset(tundev):
+     '''Reset the DNS status'''
+     if not nm.has_dnsmasq():
+-        systemcheck('service appgate-dumb-resolver stop')
++        systemcheck('systemctl stop appgate-dumb-resolver')
+     else:
+         if not nm.nm_has_dnsmasq():
+-            systemcheck('service appgate-resolver stop')
++            systemcheck('systemctl stop appgate-resolver')
+         else:
+             systemcheck('pkill -HUP NetworkManager')
+ 
+@@ -418,7 +418,7 @@
+         with open(RESOLVE_FILE, 'wt') as f:
+             f.write('\n'.join('nameserver %s' % i for i in servers))
+             f.write('\n')
+-        systemcheck('service appgate-dumb-resolver start')
++        systemcheck('systemctl start appgate-dumb-resolver')
+ 
+ 
+ if __name__ == '__main__':