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>
(cherry picked from commit b8c47eae98929ea61d124af0e554daad8cc4feae)

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 971144b12a9dc7eeea29befde89d50212bb24795..8747c030b029bdd15e34360e16b92766351c17e2 100644 (file)
--- 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 35a12c3305f037436334a4c0f87d2e14f2eb3451..39660dd81bf4c1e59f1a5198154da8b8e4c8f02d 100755 (executable)
--- 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}" ]; } ||