Merge pull request #18293 from hexian000/privoxy_bugfix

privoxy: prevent killing the init script itself when stopping service
This commit is contained in:
Jeffery To 2022-05-15 01:20:41 +08:00 committed by GitHub
commit f4826a0f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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