adblock: backport updates upto 2.4.0-2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Original commit messages:

adblock: update 2.3.2
* optimize memory consumption &
  enable overall sort only on devices with > 64MB RAM,
  this prevents sort related kernel dumps
(cherry picked from commit 8c5b9a0802)

adblock: release 2.4.0
* add tld compression,
  this new "top level domain compression" removes up to 40 thousand
  needless host entries from the block lists and
  lowers the memory footprint for the dns backends by 8-10 MByte
* optimize restart behavior in case of an error
* cosmetics
(cherry picked from commit ed470f0dcc)

adblock: release 2.4.0 (release 2)
* add missing sort step if tld compression was disabled
(cherry picked from commit b3b9972eac)
This commit is contained in:
Dirk Brenken
2017-03-04 18:20:24 +02:00
committed by Hannu Nyman
parent d98b545bf9
commit afe6be45e3
4 changed files with 75 additions and 64 deletions
+1 -6
View File
@@ -37,7 +37,6 @@ start_service()
if [ $(/etc/init.d/adblock enabled; printf ${?}) -eq 0 ]
then
procd_open_instance "adblock"
procd_set_param env adb_procd="true"
procd_set_param command "${adb_script}" "${@}"
procd_set_param stdout 1
procd_set_param stderr 1
@@ -52,7 +51,6 @@ reload_service()
stop_service()
{
export adb_procd="true"
rc_procd "${adb_script}" stop
}
@@ -73,7 +71,6 @@ resume()
query()
{
export adb_procd="true"
rc_procd "${adb_script}" query "${1}"
}
@@ -81,8 +78,6 @@ service_triggers()
{
local iface="$(uci -q get adblock.global.adb_iface)"
procd_open_trigger
procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start
if [ -z "${iface}" ]
then
procd_add_raw_trigger "interface.*.up" 1000 /etc/init.d/adblock start
@@ -92,5 +87,5 @@ service_triggers()
procd_add_interface_trigger "interface.*.up" "${name}" /etc/init.d/adblock start
done
fi
procd_close_trigger
procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start
}