travelmate: update to 2.1.3-3

* properly escape double quotes in travelmate option values * minor procd tweaks Signed-off-by: Dirk Brenken <[email protected]> (cherry picked from commit 128875a)
immortalwrt · Dec 17, 2024 · 8bf3f98 · 8bf3f98
1 parent 2da11f9
commit 8bf3f98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
 PKG_VERSION:=2.1.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>
 

diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init
@@ -33,8 +33,8 @@ start_service() {
 		procd_set_param command "${trm_script}" "${@}"
 		procd_set_param pidfile "${trm_pidfile}"
 		procd_set_param nice "$(uci_get travelmate global trm_nice "0")"
-		procd_set_param stdout 1
-		procd_set_param stderr 1
+		procd_set_param stdout 0
+		procd_set_param stderr 0
 		procd_close_instance
 	fi
 }

diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
@@ -84,11 +84,11 @@ f_env() {
 
 		if [ "${name}" = "travelmate" ] && [ "${type}" = "global" ]; then
 			option_cb() {
-				local option="${1}" value="${2}"
+				local option="${1}" value="${2//\"/\\\"}"
 				eval "${option}=\"${value}\""
 			}
 			list_cb() {
-				local option="${1}" value="${2}"
+				local option="${1}" value="${2//\"/\\\"}"
 				if [ "${option}" = "trm_vpnifacelist" ] && ! printf "%s" "${trm_vpnifacelist}" | "${trm_grepcmd}" -q "${value}"; then
 					eval "trm_vpnifacelist=\"$(printf "%s" "${trm_vpnifacelist}") ${value}\""
 				fi