[package] fix stunnel restart, bump makefile (#5897, #6220)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@18994 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile
index ff16727..4693305 100644 (file)
--- a/net/stunnel/Makefile
+++ b/net/stunnel/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunnel
 PKG_VERSION:=4.29
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=14dc3f8412947f0548975cbce74d6863
 PKG_SOURCE_URL:=http://www.stunnel.org/download/stunnel/src/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/net/stunnel/files/stunnel.init b/net/stunnel/files/stunnel.init
index f74ff68..a3ea103 100644 (file)
--- a/net/stunnel/files/stunnel.init
+++ b/net/stunnel/files/stunnel.init
@@ -26,5 +26,9 @@ start() {
 }
 
 stop() {
-       [ -f $PID_F ] && kill -9 $(cat $PID_F) && rm -f $PID_F
+       [ -f $PID_F ] && {
+               kill $(cat $PID_F)
+               kill -9 $(cat $PID_F)
+               rm -f $PID_F
+       }
 }