From feca82971aaba73dee1a12168bcfba17ef31dd8f Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sat, 23 Feb 2019 07:55:26 +0100
Subject: [PATCH] travelmate: bugfix 1.3.7

* fix a possible 'reload' race condition

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 net/travelmate/Makefile              | 2 +-
 net/travelmate/files/travelmate.init | 4 ++--
 net/travelmate/files/travelmate.sh   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index f552c6ce5..e989162e8 100644
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
-PKG_VERSION:=1.3.6
+PKG_VERSION:=1.3.7
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init
index b3362b151..cfe338e94 100755
--- a/net/travelmate/files/travelmate.init
+++ b/net/travelmate/files/travelmate.init
@@ -31,14 +31,14 @@ start_service()
 
 reload_service()
 {
-	local ppid pid
+	local ppid pid timeout="$(uci_get travelmate global trm_timeout)"
 
 	if [ -s "${trm_pidfile}" ]
 	then
 		ppid="$(cat "${trm_pidfile}" 2>/dev/null)"
 		if [ -n "${ppid}" ]
 		then
-			pid="$(pgrep sleep -P ${ppid} 2>/dev/null)"
+			pid="$(pgrep -xnf "sleep ${timeout:-60} 0" -P ${ppid} 2>/dev/null)"
 			if [ -n "${pid}" ]
 			then
 				kill -INT ${pid} 2>/dev/null
diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index 71bb6712b..c280dff51 100755
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -10,7 +10,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-trm_ver="1.3.6"
+trm_ver="1.3.7"
 trm_sysver="unknown"
 trm_enabled=0
 trm_debug=0
@@ -474,7 +474,7 @@ do
 			f_check "initial"
 			if [ "${trm_ifstatus}" = "true" ]
 			then
-				sleep ${trm_timeout}
+				sleep ${trm_timeout} 0
 			fi
 			if [ $? -eq 0 ] || [ "${trm_ifstatus}" = "false" ]
 			then