diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2022-05-15 01:20:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 01:20:41 +0800 |
| commit | f4826a0f7461b26bf6ca090dad3d7a78af6b163b (patch) | |
| tree | c8d5952054015e3e979d49fb62b18e82d2733484 | |
| parent | dcb0495ca1dc617fd1e1f9201cefda9b4705fe52 (diff) | |
| parent | 5d917b957891c23d030c1e64c4857cb1a1035650 (diff) | |
Merge pull request #18293 from hexian000/privoxy_bugfix
privoxy: prevent killing the init script itself when stopping service
| -rw-r--r-- | net/privoxy/Makefile | 6 | ||||
| -rw-r--r-- | net/privoxy/files/privoxy.init | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index c33efd9c6..1f8e72a09 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=privoxy -PKG_VERSION:=3.0.28 -PKG_RELEASE:=1 +PKG_VERSION:=3.0.33 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=privoxy-$(PKG_VERSION)-stable-src.tar.gz PKG_SOURCE_URL:=@SF/ijbswa -PKG_HASH:=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a +PKG_HASH:=04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae PKG_BUILD_DIR:=$(BUILD_DIR)/privoxy-$(PKG_VERSION)-stable PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/privoxy/files/privoxy.init b/net/privoxy/files/privoxy.init index d9c92fb7d..ae493c2bd 100644 --- a/net/privoxy/files/privoxy.init +++ b/net/privoxy/files/privoxy.init @@ -169,7 +169,7 @@ stop() { local _PID=$(cat $PIDFILE 2>/dev/null) kill -15 $_PID 2>/dev/null sleep 1 # give time to shutdown - local _tmp=$(pgrep privoxy | tr "\n" " ") + local _tmp=$(pgrep /usr/sbin/privoxy | tr "\n" " ") if [ -z "$_tmp" ]; then logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully" else |