Update to latest version

3 files changed, 26 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96d5d9e9156a..ab25c3549922 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,16 @@
 pkgbase = torguard
 	pkgdesc = TorGuard VPN Software Stay private online with TorGuard's anonymous VPN software and connect to 37+ countries worldwide.
-	pkgver = 4.8.15
+	pkgver = 4.8.17
 	pkgrel = 1
 	url = https://www.torguard.net
+	install = torguard.install
 	arch = x86_64
 	license = custom
 	depends = iproute2
-	depends = qt5-websockets
-	depends = qt5-declarative
-	depends = qt5-quickcontrols2
-	depends = qt5-svg
-	depends = shadowsocks-libev
-	depends = unbound
-	depends = stunnel
+	depends = psmisc
+	depends = libxkbcommon-x11
 	optdepends = wireguard-tools: wireguard support
-	source = torguard.sysusers
-	sha256sums = b1f954c54725794f94009c72e12746f203ce6dd4318a19ad0c10d5d8684cd873
-	source_x86_64 = https://updates.torguard.biz/Software/Linux/torguard-v4.8.15-amd64-arch.tar.gz
-	sha256sums_x86_64 = 786a3478a13b6c0866bdef0bf6c18982adef27f7424deb0bc17dc54cf67ef9db
+	source = https://updates.torguard.biz/Software/Linux/torguard-v4.8.17-amd64-arch.tar.gz
+	sha256sums = f4b6d999ed0db54739e261d2ab44afdde7bbb87ba84f71670a61baa291cbcfc0
 
 pkgname = torguard
diff --git a/PKGBUILD b/PKGBUILD
index 4830f4a6ca57..e3fdd1ace65f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,24 @@
-# Maintainer: coco
-# Co-Maintainer: dramm <dramm at archlinux dot email>
-# Contributor: thatgeek
+# Maintainer: ABOhiccups <https://twitter.com/ABOhiccups>
+# Contributor: Arch Linux Community
 # Contributor: TorGuard Support <support@torguard.com>
 pkgname=torguard
-pkgver=4.8.15
-build=build.218.1+gfd1129b
+pkgver=4.8.17
+build=build.242.1+gcefc4e9
 pkgrel=1
 pkgdesc="TorGuard VPN Software
  Stay private online with TorGuard's anonymous VPN software and connect to 37+ countries worldwide."
 arch=('x86_64')
 url="https://www.torguard.net"
-depends=('iproute2'
-	'qt5-websockets'
-	'qt5-declarative'
-	'qt5-quickcontrols2'
-	'qt5-svg'
-	'shadowsocks-libev'
-    'unbound'
-	'stunnel')
+depends=('iproute2' 'psmisc' 'libxkbcommon-x11')
 optdepends=('wireguard-tools: wireguard support')
 license=(custom)
-source_x86_64=("https://updates.torguard.biz/Software/Linux/torguard-v${pkgver}-amd64-arch.tar.gz")
-source=('torguard.sysusers')
-sha256sums_x86_64=('30b7e5f669bb5c07cd50da60cd572efa86b0fa59421f2644c3e5bbc2fd67ba45')
-sha256sums=('b1f954c54725794f94009c72e12746f203ce6dd4318a19ad0c10d5d8684cd873')
-
-prepare() {
-	tar -xf "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/torguard-v${pkgver}-${build}-amd64-arch.tar"
-}
+source=("https://updates.torguard.biz/Software/Linux/torguard-v${pkgver}-amd64-arch.tar.gz")
+sha256sums=('f4b6d999ed0db54739e261d2ab44afdde7bbb87ba84f71670a61baa291cbcfc0')
+install=torguard.install
 
 package() {
-	mkdir "$pkgdir"/opt/
-	mkdir "$pkgdir"/opt/torguard/
-	mkdir "$pkgdir"/opt/torguard/bin/
-	mkdir "$pkgdir"/opt/torguard/doc/
-
-	cp "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/bin/torguard" "${pkgdir}/opt/torguard/bin/"
-	cp "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/bin/torguard-wrapper" "${pkgdir}/opt/torguard/bin/"
-	cp "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/bin/openconnect" "${pkgdir}/opt/torguard/bin/"
-	cp "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/bin/openvpn" "${pkgdir}/opt/torguard/bin/"
-	cp "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/bin/vpnc-script" "${pkgdir}/opt/torguard/bin/"
-	cp -r "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/opt/torguard/doc" "${pkgdir}/opt/torguard" -R
-	cp -r "${srcdir}/${pkgname}-v${pkgver}-${build}-amd64-arch/usr" "${pkgdir}/" -R
-
-	find "$pkgdir"/opt/torguard/ -type f -exec chmod 644 {} \;
-	find "$pkgdir"/opt/torguard/ -name torguard -exec chmod 755 {} \;
-	find "$pkgdir"/opt/torguard/ -name torguard-wrapper -exec chmod 755 {} \;
-	find "$pkgdir"/opt/torguard/ -name openconnect -exec chmod 755 {} \;
-	find "$pkgdir"/opt/torguard/ -name openvpn -exec chmod 755 {} \;
-	find "$pkgdir"/opt/torguard/ -name vpnc-script -exec chmod 755 {} \;
+        bsdtar -xf "${srcdir}/torguard-v${pkgver}-${build}-amd64-arch/torguard-v${pkgver}-${build}-amd64-arch.tar" -C "$pkgdir" -s"/torguard-v${pkgver}-${build}-amd64-arch//"
 
 	install -d "$pkgdir"/usr/bin/
 	ln -s /opt/torguard/bin/torguard-wrapper "$pkgdir"/usr/bin/torguard
-	ln -s /usr/bin/ss-local "$pkgdir"/opt/torguard/bin/ss-local
-	ln -s /usr/bin/stunnel_5_42 "$pkgdir"/opt/torguard/bin/stunnel_5_42
-	ln -s /usr/bin/stunnel_5_57 "$pkgdir"/opt/torguard/bin/stunnel_5_57
-
-	install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
 }
diff --git a/torguard.install b/torguard.install
new file mode 100644
index 000000000000..d043778df0ed
--- /dev/null
+++ b/torguard.install
@@ -0,0 +1,11 @@
+pre_install() {
+        if ! grep -q "^torguard:" /etc/group ; then groupadd --system torguard; fi
+}
+
+pre_upgrade() {
+        if ! grep -q "^torguard:" /etc/group ; then groupadd --system torguard; fi
+}
+
+post_remove() {
+}
+