travelmate: update to 2.1.3-3

* properly escape double quotes in travelmate option values
* minor procd tweaks

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

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 361e7934384ec30b4702fde0721bf2194e88e5e7..dfaf419ef34eda26e5d3ebfc8c6d658327f0ca2e 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.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init
index 4a7dbf2609d75f1fb7e48e188ff1b134e8ed1cb1..37b301950a7459a7aabcccbfe351b17d39cbde00 100755 (executable)
--- 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
index 5e32379ec173f85e1a9c4d1090a25dcba5d12a37..442918d6b8d7e6dcb4f8ba0e53a0b7c3fdd0615c 100755 (executable)
--- 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