privoxy: modified init scripts

remove "killall" from initscript because it kills itself #867

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index a693802a9f83897f4e2ae75bcc870d7aed2d62aa..c7c0564a943b20e8eb2a78703e019a384f1d89e0 100644 (file)
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=privoxy
 PKG_VERSION:=3.0.23
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz
 PKG_SOURCE_URL:=@SF/ijbswa

diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init
index 8ffc6f2c81e7474f7663d475af9c8053eb8bff02..9b4f3a32714569fa0a53f6e7be4f5ac3a53911bb 100644 (file)
--- a/net/privoxy/files/privoxy.init
+++ b/net/privoxy/files/privoxy.init
@@ -108,11 +108,11 @@ stop() {
        local _PID=$(cat $PIDFILE 2>/dev/null)
        kill -15 $_PID 2>/dev/null
        sleep 1                 # give time to shutdown
-       local _tmp=$(pgrep privoxy)
+       local _tmp=$(pgrep privoxy | tr "\n" " ")
        if [ -z "$_tmp" ]; then
                logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully"
        else
-               killall -9 privoxy
+               kill -9 $_tmp   # Normally never come here
                logger -p daemon.warn -t "privoxy[-----]" "Shutdown forced by KILL"
        fi
        return 0