From: Dirk Brenken <dev@brenken.org>
Date: Mon, 18 Mar 2024 21:09:09 +0000 (+0100)
Subject: travelmate: update 2.1.2-6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b8c47eae98929ea61d124af0e554daad8cc4feae;p=feed%2Fpackages.git

travelmate: update 2.1.2-6

* fix vpn semaphore handling (#23643), thanks to @brianjmurrell
* disable vpn processing by default

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 971144b12a..8747c030b0 100644
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
 PKG_VERSION:=2.1.2
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index 35a12c3305..39660dd81b 100755
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -14,7 +14,7 @@ trm_debug="0"
 trm_iface=""
 trm_captive="1"
 trm_proactive="1"
-trm_vpn="1"
+trm_vpn="0"
 trm_netcheck="0"
 trm_autoadd="0"
 trm_randomize="0"
@@ -233,9 +233,11 @@ f_vpn() {
 					f_log "info" "take down openvpn instance '${vpn_instance}' (switch)"
 					rc="1"
 				fi
-				[ "${rc}" = "1" ] && break
+				if [ "${rc}" = "1" ]; then
+					rm -f "${trm_vpnfile}"
+					break
+				fi
 			done
-			rm -f "${trm_vpnfile}"
 		fi
 		if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
 			if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||