Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2161 from dibdot/adblock

Browse source 
adblock: bugfix
This commit is contained in:
Ted Hess 2015-12-21 08:55:28 -05:00
commit eae3e52962
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=0.40.1 PKG_VERSION:=0.40.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dirk@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dirk@brenken.org>

25
net/adblock/files/adblock-helper.sh
View file

@ -536,6 +536,10 @@ f_deltemp()
# #
f_remove() f_remove()
{ {
local query_pid
local query_date
local query_total
local query_blocked
if [ "${query_ok}" = "true" ] && [ "${ntp_ok}" = "true" ] if [ "${query_ok}" = "true" ] && [ "${ntp_ok}" = "true" ]
then then
query_date="$(date "+%Y%m%d")" query_date="$(date "+%Y%m%d")"
@ -547,20 +551,23 @@ f_remove()
fi fi
if [ -s "${adb_querypid}" ] && [ ! -f "${adb_queryfile}.${query_date}" ] if [ -s "${adb_querypid}" ] && [ ! -f "${adb_queryfile}.${query_date}" ]
then then
kill -9 "$(cat "${adb_querypid}")" >/dev/null 2>&1 query_pid="$(cat "${adb_querypid}" 2>/dev/null)"
> "${adb_querypid}"
kill -9 "${query_pid}" >/dev/null 2>&1
rc=${?} rc=${?}
if [ $((rc)) -eq 0 ] if [ $((rc)) -eq 0 ]
then then
find "${adb_backupdir}" -maxdepth 1 -type f -mtime +"${adb_queryhistory}" -name "${query_name}.*" -exec rm -f "{}" \; 2>/dev/null find "${adb_backupdir}" -maxdepth 1 -type f -mtime +"${adb_queryhistory}" -name "${query_name}.*" -exec rm -f "{}" \; 2>/dev/null
rc=${?} rc=${?}
fi if [ $((rc)) -eq 0 ]
if [ $((rc)) -eq 0 ] then
then f_log "remove old domain query background process (pid: ${query_pid}) and do logfile housekeeping"
f_log "remove old domain query log background process (pid: $(cat "${adb_querypid}")) and do logfile housekeeping" else
f_log "error during domain query logfile housekeeping" "${rc}"
fi
else else
f_log "error during domain query removal/housekeeping (pid: $(cat "${adb_querypid}"))" "${rc}" f_log "error during domain query background process removal (pid: ${query_pid})" "${rc}"
fi fi
> "${adb_querypid}"
fi fi
if [ ! -s "${adb_querypid}" ] if [ ! -s "${adb_querypid}" ]
then then
@ -569,9 +576,9 @@ f_remove()
if [ $((rc)) -eq 0 ] if [ $((rc)) -eq 0 ]
then then
sleep 1 sleep 1
f_log "new domain query log background process started (pid: $(cat "${adb_querypid}"))" f_log "new domain query log background process started (pid: $(cat "${adb_querypid}" 2>/dev/null))"
else else
f_log "error during domain query start" "${rc}" f_log "error during domain query background process start" "${rc}"
fi fi
fi fi
fi fi

2
net/adblock/files/adblock-update.sh
View file

@ -25,7 +25,7 @@
# set script version # set script version
# #
adb_version="0.40.1" adb_version="0.40.2"
# get current pid, script directory and openwrt version # get current pid, script directory and openwrt version
# #