fixed: openvpn >=2.6 refuses to connect when --ncp-disable parameter is given

4 files changed, 43 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a98d520a39a..7171600e588a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = cyberghostvpn
 	pkgdesc = CyberGhost VPN
 	pkgver = 1.4.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.cyberghostvpn.com
 	arch = any
 	license = custom:cyberghostvpn
 	makedepends = zip
+	depends = bash
 	depends = curl
 	depends = openvpn
 	depends = wireguard-tools
 	depends = resolvconf
-	source = https://download.cyberghostvpn.com/linux/cyberghostvpn-fedora-32-1.4.1.zip
-	sha256sums = 772d3278eaffa7dd5f91a5d988efbf0ff6e0521188cfb5445c14207d3172ee44
+	source = https://download.cyberghostvpn.com/linux/cyberghostvpn-ubuntu-20.04-1.4.1.zip
+	source = cyberghostvpn_wrapper
+	source = openvpn_wrapper
+	sha256sums = c976ed4f19adbf0c4d0a7a7032419b66f19684977dec8c5237ed1b0675141a96
+	sha256sums = 388e6b86db32e6fb513769257e58efb32392fe5f020cc8bb2f67a506ac59206e
+	sha256sums = f26e37ce43385e625b012afd3d27bad9f9279e3d6cb135cd92c412eada36212e
 
 pkgname = cyberghostvpn
diff --git a/PKGBUILD b/PKGBUILD
index c80b2dd3dd10..ad9d62633c7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 
 pkgname=cyberghostvpn
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="CyberGhost VPN"
 url="https://www.cyberghostvpn.com"
 arch=(any)
 license=(custom:cyberghostvpn)
 depends=(
+  bash
   curl
   openvpn
   wireguard-tools
@@ -18,13 +19,20 @@ depends=(
 makedepends=(zip)
 
 _variant=ubuntu-20.04
-source=("https://download.cyberghostvpn.com/linux/cyberghostvpn-${_variant}-${pkgver}.zip")
-sha256sums=('c976ed4f19adbf0c4d0a7a7032419b66f19684977dec8c5237ed1b0675141a96')
+source=(	"https://download.cyberghostvpn.com/linux/cyberghostvpn-${_variant}-${pkgver}.zip"
+		"cyberghostvpn_wrapper"
+		"openvpn_wrapper")
+sha256sums=(	'c976ed4f19adbf0c4d0a7a7032419b66f19684977dec8c5237ed1b0675141a96'
+		'388e6b86db32e6fb513769257e58efb32392fe5f020cc8bb2f67a506ac59206e'
+		'f26e37ce43385e625b012afd3d27bad9f9279e3d6cb135cd92c412eada36212e')
 
 _archive="${pkgname}-${_variant}-${pkgver}"
 
 package() {
   _installdir=usr/local/cyberghost
+  install -Dm 755 openvpn_wrapper "$pkgdir/${_installdir}/wrapper/openvpn_wrapper"
+  install -Dm 755 cyberghostvpn_wrapper "$pkgdir/${_installdir}/wrapper/cyberghostvpn_wrapper"
+  ln -s "$pkgdir/${_installdir}/wrapper/openvpn_wrapper" "$pkgdir/${_installdir}/openvpn"
 
   cd "$_archive"
 
@@ -36,6 +44,6 @@ package() {
   install -Dm 644 cyberghost/certs/openvpn/client.key "$pkgdir/${_installdir}/certs/openvpn/client.key"
 
   install -dm 755 $pkgdir/usr/bin
-  ln -s /${_installdir}/cyberghostvpn $pkgdir/usr/bin/cyberghostvpn
+  ln -s /${_installdir}/wrapper/cyberghostvpn_wrapper $pkgdir/usr/bin/cyberghostvpn
   ln -s /${_installdir}/update-systemd-resolved $pkgdir/usr/bin/update-systemd-resolved
 }
diff --git a/cyberghostvpn_wrapper b/cyberghostvpn_wrapper
new file mode 100755
index 000000000000..144c0e892646
--- /dev/null
+++ b/cyberghostvpn_wrapper
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# put location of openvpn wrapper first in $PATH
+# to ensure that cyberghost is calling the openvpn wrapper
+export PATH=/usr/local/cyberghost:$PATH
+
+/usr/local/cyberghost/cyberghostvpn "$@"
diff --git a/openvpn_wrapper b/openvpn_wrapper
new file mode 100755
index 000000000000..318dc95dd019
--- /dev/null
+++ b/openvpn_wrapper
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# strip --ncp-disable parameter from call
+#  --ncp-disable is removed from openvpn >=2.6
+args=("$@")
+for ((i=0;i<${#args[@]};i++))
+do
+	if [ "${args[$i]}" == "--ncp-disable" ]
+	then
+		unset args[$i]
+	fi
+done
+
+echo "$0: openvpn wrapper for cyberghostvpn utility"
+echo now executing /usr/bin/openvpn "${args[@]}"
+/usr/bin/openvpn "${args[@]}"