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

adblock: update 3.8.2

Browse source 
* background service: no longer miss "signal" events for the
  dns backend (to trigger adblock)
* fix a dns backend reload issue during switch between
  different blocking modes
* domain query: report found domains only once in
  "null" blocking mode with IPv4 & IPv6 list entries

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 806f5ca9d8)
This commit is contained in:
Dirk Brenken 2019-08-21 11:16:43 +02:00
parent 41a1b013fa
commit 3dc3f15d30
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

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

2
net/adblock/files/adblock.service
View file

@ -21,7 +21,7 @@ if [ -x "${adb_ubus}" ] && [ -n "${adb_dns}" ]
then then
logger -p "info" -t "adblock-${adb_basever} [${$}]" "ubus/adblock service started" logger -p "info" -t "adblock-${adb_basever} [${$}]" "ubus/adblock service started"
"${adb_ubus}" -S -M r -m invoke monitor | \ "${adb_ubus}" -S -M r -m invoke monitor | \
{ grep -qF "\"method\":\"set\",\"data\":{\"name\":\"${adb_dns}\""; [ $? -eq 0 ] && /etc/init.d/adblock start; } { grep -qE "\"method\":\"(set|signal)\",\"data\":\{\"name\":\"${adb_dns}\""; [ $? -eq 0 ] && /etc/init.d/adblock start; }
else else
logger -p "err" -t "adblock-${adb_basever} [${$}]" "can't start ubus/adblock service" logger -p "err" -t "adblock-${adb_basever} [${$}]" "can't start ubus/adblock service"
fi fi

14
net/adblock/files/adblock.sh
View file

@ -10,7 +10,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="3.8.1" adb_ver="3.8.2"
adb_sysver="unknown" adb_sysver="unknown"
adb_enabled=0 adb_enabled=0
adb_debug=0 adb_debug=0
@ -320,6 +320,9 @@ f_uci()
/etc/init.d/firewall reload >/dev/null 2>&1 /etc/init.d/firewall reload >/dev/null 2>&1
;; ;;
*) *)
> "${adb_dnsdir}/${adb_dnsfile}"
f_count
f_jsnup "running"
/etc/init.d/"${adb_dns}" reload >/dev/null 2>&1 /etc/init.d/"${adb_dns}" reload >/dev/null 2>&1
;; ;;
esac esac
@ -372,7 +375,7 @@ f_extconf()
if [ "${adb_enabled}" -eq 1 ] && [ -z "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ] if [ "${adb_enabled}" -eq 1 ] && [ -z "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ]
then then
uci_set dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile "${adb_dnsdir}/${adb_dnsfile}" uci_set dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile "${adb_dnsdir}/${adb_dnsfile}"
if [ "${adb_enabled}" -eq 1 ] && [ -n "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" addnhosts | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ] if [ -n "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" addnhosts | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ]
then then
uci -q del_list dhcp.@dnsmasq[${adb_dnsinstance}].addnhosts="${adb_dnsdir}/${adb_dnsfile}" uci -q del_list dhcp.@dnsmasq[${adb_dnsinstance}].addnhosts="${adb_dnsdir}/${adb_dnsfile}"
fi fi
@ -385,7 +388,7 @@ f_extconf()
if [ "${adb_enabled}" -eq 1 ] && [ -z "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" addnhosts | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ] if [ "${adb_enabled}" -eq 1 ] && [ -z "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" addnhosts | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ]
then then
uci -q add_list dhcp.@dnsmasq[${adb_dnsinstance}].addnhosts="${adb_dnsdir}/${adb_dnsfile}" uci -q add_list dhcp.@dnsmasq[${adb_dnsinstance}].addnhosts="${adb_dnsdir}/${adb_dnsfile}"
if [ "${adb_enabled}" -eq 1 ] && [ -n "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ] if [ -n "$(uci_get dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile | grep -Fo "${adb_dnsdir}/${adb_dnsfile}")" ]
then then
uci_remove dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile uci_remove dhcp "@dnsmasq[${adb_dnsinstance}]" serversfile
fi fi
@ -506,7 +509,6 @@ f_dnsup()
fi fi
;; ;;
esac esac
sleep 1
adb_rc=0 adb_rc=0
break break
fi fi
@ -735,7 +737,7 @@ f_query()
field=2 field=2
elif [ "${adb_dnsvariant% *}" = "null" ] elif [ "${adb_dnsvariant% *}" = "null" ]
then then
prefix=".*[\\t\\.]" prefix="0\\..*[\\t\\.]"
suffix="" suffix=""
field=2 field=2
fi fi
@ -1022,7 +1024,7 @@ f_main()
adb_tmpfile="${tmp_file}" adb_tmpfile="${tmp_file}"
f_list merge f_list merge
# overall sort and dns restart # tld compression and dns restart
# #
if [ -s "${adb_tmpdir}"/"${adb_dnsfile}" ] if [ -s "${adb_tmpdir}"/"${adb_dnsfile}" ]
then then