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

adblock: additional check for running dns query background task

Browse source 
fix for possible query log config change (enabled => disabled)

Please apply to upstream - thank you!

Signed-off-by: Dirk Brenken <dirk@brenken.org>
This commit is contained in:
Dirk Brenken 2015-11-12 14:56:04 +01:00
parent aa2649e8c3
commit c7edde075c
3 changed files with 13 additions and 7 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.20.1 PKG_VERSION:=0.20.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>

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

@ -256,6 +256,7 @@ f_envcheck()
# check dns query log configuration # check dns query log configuration
# #
adb_querydir="${adb_queryfile%/*}" adb_querydir="${adb_queryfile%/*}"
query_pid="/var/run/adb_query.pid"
if [ -n "${adb_querydir}" ] && [ -d "${adb_querydir}" ] if [ -n "${adb_querydir}" ] && [ -d "${adb_querydir}" ]
then then
# check find capabilities # check find capabilities
@ -269,11 +270,16 @@ f_envcheck()
query_ok="true" query_ok="true"
query_name="${adb_queryfile##*/}" query_name="${adb_queryfile##*/}"
query_ip="${adb_ip//./\\.}" query_ip="${adb_ip//./\\.}"
query_pid="/var/run/query.pid"
adb_mounts="${adb_mounts} ${adb_querydir}" adb_mounts="${adb_mounts} ${adb_querydir}"
fi fi
else else
query_ok="false" query_ok="false"
if [ -s "${query_pid}" ]
then
kill -9 $(< "${query_pid}") 2>/dev/null
> "${query_pid}"
/usr/bin/logger -t "adblock[${pid}]" "info: remove old dns query log background process"
fi
/usr/bin/logger -t "adblock[${pid}]" "info: dns query logging will be disabled" /usr/bin/logger -t "adblock[${pid}]" "info: dns query logging will be disabled"
fi fi
@ -293,7 +299,7 @@ f_envcheck()
exit 50 exit 50
elif [ $((av_space)) -lt $((adb_minspace)) ] elif [ $((av_space)) -lt $((adb_minspace)) ]
then then
/usr/bin/logger -t "adblock[${pid}]" "error: not enough space on device (${mp})" /usr/bin/logger -t "adblock[${pid}]" "error: not enough space left on device (${mp})"
exit 55 exit 55
fi fi
done done
@ -378,8 +384,8 @@ f_remove()
# #
f_deltemp f_deltemp
# kill existing domain query log background process, # remove existing domain query log background process,
# housekeeping and start of a new process on daily basis # do housekeeping and start a new process on daily basis
# #
if [ "${query_ok}" = "true" ] && [ "${ntp_ok}" = "true" ] if [ "${query_ok}" = "true" ] && [ "${ntp_ok}" = "true" ]
then then
@ -389,7 +395,7 @@ f_remove()
kill -9 $(< "${query_pid}") 2>/dev/null kill -9 $(< "${query_pid}") 2>/dev/null
> "${query_pid}" > "${query_pid}"
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
/usr/bin/logger -t "adblock[${pid}]" "info: kill old query log background process and do logfile housekeeping" /usr/bin/logger -t "adblock[${pid}]" "info: remove old dns query log background process and do logfile housekeeping"
fi fi
if [ ! -s "${query_pid}" ] if [ ! -s "${query_pid}" ]
then then

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

@ -25,7 +25,7 @@
# set script version # set script version
# #
adb_version="0.20.1" adb_version="0.20.2"
# get current pid and script directory # get current pid and script directory
# #