Use tarball binaries of openvpn and openconnect

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88491c9bd2c8..ddf8b0a91b0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,14 +6,13 @@ pkgbase = torguard
 	arch = x86_64
 	license = custom
 	depends = iproute2
-	depends = qt5-base
-	depends = openvpn
+	depends = qt5-websockets
 	depends = shadowsocks-libev
 	depends = stunnel
 	source = torguard.sysusers
 	sha256sums = b1f954c54725794f94009c72e12746f203ce6dd4318a19ad0c10d5d8684cd873
 	source_x86_64 = https://updates.torguard.biz/Software/Linux/torguard-v3.96.1-amd64-arch.tar.gz
-	sha256sums_x86_64 = da7e6c90e806ba71c1b37e44b3b2238ba19bc415bf6d77b5b5844206d2dfc2c7
+	sha256sums_x86_64 = 6fb515106c5b1c6fad0f53e3bbb6eacf21198bc444cd06e2a5c381d91864810d
 
 pkgname = torguard
 
diff --git a/PKGBUILD b/PKGBUILD
index c1846725503a..4cf6a427e673 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ arch=('x86_64')
 url="https://www.torguard.com"
 depends=('iproute2'
 	'qt5-websockets'
-	'openvpn'
 	'shadowsocks-libev'
 	'stunnel')
 license=(custom)
@@ -28,21 +27,27 @@ package() {
 	mkdir "$pkgdir"/opt/
 	mkdir "$pkgdir"/opt/torguard/
 	mkdir "$pkgdir"/opt/torguard/bin/
-	mkdir "$pkgdir"/opt/torguard/doc
+	mkdir "$pkgdir"/opt/torguard/doc/
+	mkdir "$pkgdir"/opt/torguard/lib/
 
 	cp "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/bin/torguard" "${pkgdir}/opt/torguard/bin/"
 	cp "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/bin/openconnect" "${pkgdir}/opt/torguard/bin/"
+	cp "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/bin/openvpn_v2_4" "${pkgdir}/opt/torguard/bin/"
 	cp "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/bin/vpnc-script" "${pkgdir}/opt/torguard/bin/"
+	cp "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/lib/libQt5EglDeviceIntegration.so.5" "${pkgdir}/opt/torguard/lib/"
 	cp -r "${srcdir}/${pkgname}-v${pkgver}-amd64-arch/opt/torguard/doc" "${pkgdir}/opt/torguard" -R
 	cp -r "${srcdir}/${pkgname}-v${pkgver}-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 openconnect -exec chmod 755 {} \;
+	find "$pkgdir"/opt/torguard/ -name openvpn_v2_4 -exec chmod 755 {} \;
 	find "$pkgdir"/opt/torguard/ -name vpnc-script -exec chmod 755 {} \;
 
 	install -d "$pkgdir"/usr/bin/
 	ln -s /opt/torguard/bin/torguard "$pkgdir"/usr/bin/torguard
-	ln -s /usr/bin/openvpn "$pkgdir"/opt/torguard/bin/openvpn_v2_4
+	ln -s /usr/bin/ss-local "$pkgdir"/opt/torguard/bin/ss-local
+	ln -s /usr/bin/stunnel "$pkgdir"/opt/torguard/bin/stunnel
 
 	install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
 }