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

Merge pull request #1971 from dibdot/adblock

Browse source 
adblock: fix redirection issues
This commit is contained in:
Ted Hess 2015-11-16 14:53:35 -05:00
commit fbec0d5d11
3 changed files with 19 additions and 18 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.2 PKG_VERSION:=0.20.3
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>

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

@ -276,7 +276,7 @@ f_envcheck()
query_ok="false" query_ok="false"
if [ -s "${query_pid}" ] if [ -s "${query_pid}" ]
then then
kill -9 $(< "${query_pid}") 2>/dev/null kill -9 $(cat "${query_pid}") 2>/dev/null
> "${query_pid}" > "${query_pid}"
/usr/bin/logger -t "adblock[${pid}]" "info: remove old dns query log background process" /usr/bin/logger -t "adblock[${pid}]" "info: remove old dns query log background process"
fi fi
@ -392,14 +392,14 @@ f_remove()
query_date="$(date "+%Y%m%d")" query_date="$(date "+%Y%m%d")"
if [ -s "${query_pid}" ] && [ ! -f "${adb_queryfile}.${query_date}" ] if [ -s "${query_pid}" ] && [ ! -f "${adb_queryfile}.${query_date}" ]
then then
kill -9 $(< "${query_pid}") 2>/dev/null kill -9 $(cat "${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: remove old dns 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
( logread -f 2>/dev/null & printf -n "$!" > "${query_pid}" ) | egrep -o "(query\[A\].*)|([a-z0-9\.\-]* is ${query_ip}$)" >> "${adb_queryfile}.${query_date}" & ( logread -f 2>/dev/null & printf "$!" > "${query_pid}" ) | egrep -o "(query\[A\].*)|([a-z0-9\.\-]* is ${query_ip}$)" >> "${adb_queryfile}.${query_date}" &
/usr/bin/logger -t "adblock[${pid}]" "info: start new domain query log background process" /usr/bin/logger -t "adblock[${pid}]" "info: start new domain query log background process"
fi fi
fi fi
@ -423,11 +423,11 @@ f_restore()
then then
cp -f "${adb_backupfile}" "${adb_dnsfile}" 2>/dev/null cp -f "${adb_backupfile}" "${adb_dnsfile}" 2>/dev/null
/usr/bin/logger -t "adblock[${pid}]" "error: ${restore_msg}, adlist backup restored" /usr/bin/logger -t "adblock[${pid}]" "error: ${restore_msg}, adlist backup restored"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ${restore_msg}, adlist backup restored" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ${restore_msg}, adlist backup restored" >> "${adb_logfile}"
else else
> "${adb_dnsfile}" > "${adb_dnsfile}"
/usr/bin/logger -t "adblock[${pid}]" "error: ${restore_msg}, empty adlist generated" /usr/bin/logger -t "adblock[${pid}]" "error: ${restore_msg}, empty adlist generated"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ${restore_msg}, empty adlist generated" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ${restore_msg}, empty adlist generated" >> "${adb_logfile}"
fi fi
# restart dnsmasq # restart dnsmasq
@ -455,7 +455,7 @@ f_wancheck()
do do
if [ -d "/sys/class/net/${dev}" ] if [ -d "/sys/class/net/${dev}" ]
then then
dev_out=$(< /sys/class/net/${dev}/operstate 2>/dev/null) dev_out="$(cat /sys/class/net/${dev}/operstate 2>/dev/null)"
if [ "${dev_out}" = "up" ] if [ "${dev_out}" = "up" ]
then then
/usr/bin/logger -t "adblock[${pid}]" "info: get wan/update interface: ${dev}, after ${cnt} loops" /usr/bin/logger -t "adblock[${pid}]" "info: get wan/update interface: ${dev}, after ${cnt} loops"
@ -464,8 +464,9 @@ f_wancheck()
fi fi
if [ $((cnt)) -eq $((max_cnt)) ] if [ $((cnt)) -eq $((max_cnt)) ]
then then
wan_ok="false"
/usr/bin/logger -t "adblock[${pid}]" "error: no wan/update interface(s) found (${adb_wandev})" /usr/bin/logger -t "adblock[${pid}]" "error: no wan/update interface(s) found (${adb_wandev})"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: no wan/update interface(s) found (${adb_wandev})" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: no wan/update interface(s) found (${adb_wandev})" >> "${adb_logfile}"
restore_msg="no wan/update interface(s)" restore_msg="no wan/update interface(s)"
f_restore f_restore
fi fi
@ -506,7 +507,7 @@ f_ntpcheck()
then then
ntp_ok="false" ntp_ok="false"
/usr/bin/logger -t "adblock[${pid}]" "error: ntp time sync failed (${adb_ntpsrv})" /usr/bin/logger -t "adblock[${pid}]" "error: ntp time sync failed (${adb_ntpsrv})"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ntp time sync failed (${adb_ntpsrv})" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: ntp time sync failed (${adb_ntpsrv})" >> "${adb_logfile}"
restore_msg="time sync failed" restore_msg="time sync failed"
f_restore f_restore
fi fi

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

@ -25,7 +25,7 @@
# set script version # set script version
# #
adb_version="0.20.2" adb_version="0.20.3"
# get current pid and script directory # get current pid and script directory
# #
@ -66,14 +66,14 @@ f_envparse
# #
f_envcheck f_envcheck
# check ntp time sync
#
f_ntpcheck
# check wan update interface(s) # check wan update interface(s)
# #
f_wancheck f_wancheck
# check for ntp time sync
#
f_ntpcheck
# check/start shallalist (pre-)processing # check/start shallalist (pre-)processing
# #
if [ -n "${adb_arc_shalla}" ] if [ -n "${adb_arc_shalla}" ]
@ -89,7 +89,7 @@ then
/usr/bin/logger -t "adblock[${pid}]" "info: shallalist archive download finished" /usr/bin/logger -t "adblock[${pid}]" "info: shallalist archive download finished"
else else
/usr/bin/logger -t "adblock[${pid}]" "error: shallalist archive download failed (${adb_arc_shalla})" /usr/bin/logger -t "adblock[${pid}]" "error: shallalist archive download failed (${adb_arc_shalla})"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist archive download failed (${adb_arc_shalla})" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist archive download failed (${adb_arc_shalla})" >> "${adb_logfile}"
restore_msg="archive download failed" restore_msg="archive download failed"
f_restore f_restore
fi fi
@ -103,7 +103,7 @@ then
/usr/bin/logger -t "adblock[${pid}]" "info: shallalist archive extraction finished" /usr/bin/logger -t "adblock[${pid}]" "info: shallalist archive extraction finished"
else else
/usr/bin/logger -t "adblock[${pid}]" "error: shallalist archive extraction failed" /usr/bin/logger -t "adblock[${pid}]" "error: shallalist archive extraction failed"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist archive extraction failed" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist archive extraction failed" >> "${adb_logfile}"
restore_msg="archive extraction failed" restore_msg="archive extraction failed"
f_restore f_restore
fi fi
@ -134,7 +134,7 @@ then
/usr/bin/logger -t "adblock[${pid}]" "info: shallalist (pre-)processing finished (${adb_cat_shalla})" /usr/bin/logger -t "adblock[${pid}]" "info: shallalist (pre-)processing finished (${adb_cat_shalla})"
else else
/usr/bin/logger -t "adblock[${pid}]" "error: shallalist (pre-)processing failed (${rc}, ${adb_cat_shalla})" /usr/bin/logger -t "adblock[${pid}]" "error: shallalist (pre-)processing failed (${rc}, ${adb_cat_shalla})"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist (pre-)processing failed (${rc}, ${adb_cat_shalla})" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: shallalist (pre-)processing failed (${rc}, ${adb_cat_shalla})" >> "${adb_logfile}"
restore_msg="shallalist merge failed" restore_msg="shallalist merge failed"
f_restore f_restore
fi fi
@ -172,7 +172,7 @@ do
/usr/bin/logger -t "adblock[${pid}]" "info: empty source download finished (${url})" /usr/bin/logger -t "adblock[${pid}]" "info: empty source download finished (${url})"
else else
/usr/bin/logger -t "adblock[${pid}]" "error: source download failed (${url})" /usr/bin/logger -t "adblock[${pid}]" "error: source download failed (${url})"
printf "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: source download failed (${url})" >> "${adb_logfile}" printf "%s\n" "$(/bin/date "+%d.%m.%Y %H:%M:%S") - error: source download failed (${url})" >> "${adb_logfile}"
restore_msg="download failed" restore_msg="download failed"
f_restore f_restore
fi fi