mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-13 19:03:52 +02:00
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 b8c47eae98
)
This commit is contained in:
parent
266846a362
commit
b713fe7d27
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=travelmate
|
PKG_NAME:=travelmate
|
||||||
PKG_VERSION:=2.1.2
|
PKG_VERSION:=2.1.2
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ trm_debug="0"
|
||||||
trm_iface=""
|
trm_iface=""
|
||||||
trm_captive="1"
|
trm_captive="1"
|
||||||
trm_proactive="1"
|
trm_proactive="1"
|
||||||
trm_vpn="1"
|
trm_vpn="0"
|
||||||
trm_netcheck="0"
|
trm_netcheck="0"
|
||||||
trm_autoadd="0"
|
trm_autoadd="0"
|
||||||
trm_randomize="0"
|
trm_randomize="0"
|
||||||
|
@ -233,9 +233,11 @@ f_vpn() {
|
||||||
f_log "info" "take down openvpn instance '${vpn_instance}' (switch)"
|
f_log "info" "take down openvpn instance '${vpn_instance}' (switch)"
|
||||||
rc="1"
|
rc="1"
|
||||||
fi
|
fi
|
||||||
[ "${rc}" = "1" ] && break
|
if [ "${rc}" = "1" ]; then
|
||||||
|
rm -f "${trm_vpnfile}"
|
||||||
|
break
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
rm -f "${trm_vpnfile}"
|
|
||||||
fi
|
fi
|
||||||
if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
|
if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
|
||||||
if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||
|
if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||
|
||||||
|
|
Loading…
Reference in New Issue
Block a user