commit 144812d5c9271f3cabb7c6f8e6a97a3bc7ba4928
parent 3c1b8749fd2b280e2dd619ecf9a1ea131a3ab1db
Author: Ted Hess <thess@kitschensync.net>
Date: Thu, 14 Jul 2016 12:53:06 -0400
Merge pull request #2964 from dibdot/adblock
adblock: release 1.4.0
Diffstat:
4 files changed, 23 insertions(+), 53 deletions(-)
diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=adblock
-PKG_VERSION:=1.3.3
+PKG_VERSION:=1.4.0
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
@@ -60,7 +60,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
* use dynamic iptables chains/rulesets for adblock related redirects/rejects
* init system support (start/stop/restart/reload/toggle/stats/cfgup)
* hotplug support, the adblock start will be triggered by wan 'ifup' event
-* adblock toggle to quickly switch adblocking 'on' or 'off'
+* toggle to quickly switch adblock 'on' or 'off'
* optional: automatic adblock list backup/restore, backups will be (de-)compressed on the fly (disabled by default)
* optional: add new adblock sources via uci config (see example below)
diff --git a/net/adblock/files/adblock-helper.sh b/net/adblock/files/adblock-helper.sh
@@ -22,7 +22,6 @@ adb_forcedns=1
adb_fetchttl=5
adb_restricted=0
adb_uci="$(which uci)"
-unset adb_revsrclist
# f_envload: load adblock environment
#
diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh
@@ -10,7 +10,7 @@
#
adb_pid="${$}"
adb_pidfile="/var/run/adblock.pid"
-adb_scriptver="1.3.3"
+adb_scriptver="1.4.0"
adb_mincfgver="2.2"
adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ]
@@ -195,17 +195,9 @@ do
sort -u "${adb_tmpfile}" | eval "${adb_dnsformat}" > "${adb_dnsfile}"
fi
rc=${?}
-
- # finish domain processing, prepare find statement with revised block list source
- #
if [ $((rc)) -eq 0 ]
then
- if [ -z "${adb_revsrclist}" ]
- then
- adb_revsrclist="-name ${adb_dnsprefix}.${src_name}"
- else
- adb_revsrclist="${adb_revsrclist} -o -name ${adb_dnsprefix}.${src_name}"
- fi
+ rev_done="true"
f_log " domain merging finished"
else
rc=0
@@ -232,38 +224,26 @@ do
fi
done
-# make separate block lists entries unique
+# overall sort, make block list entries unique
#
-if [ "${mem_ok}" = "true" ] && [ -n "${adb_revsrclist}" ]
+if [ "${rev_done}" = "true" ] && [ "${mem_ok}" = "true" ]
then
f_log "remove duplicates in separate block lists"
-
- # generate a unique overall block list
- #
- sort -u "${adb_dnsdir}/${adb_dnsprefix}"* > "${adb_tmpdir}/blocklist.overall"
-
- # loop through all separate lists, ordered by size (ascending)
- #
for list in $(ls -ASr "${adb_dnsdir}/${adb_dnsprefix}"*)
do
- # check overall block list vs. separate block list,
- # write all duplicate entries to separate list
- #
list="${list/*./}"
- sort "${adb_tmpdir}/blocklist.overall" "${adb_dnsdir}/${adb_dnsprefix}.${list}" | uniq -d > "${adb_tmpdir}/tmp.${list}"
- mv -f "${adb_tmpdir}/tmp.${list}" "${adb_dnsdir}/${adb_dnsprefix}.${list}"
-
- # write all unique entries back to overall block list
- #
- sort "${adb_tmpdir}/blocklist.overall" "${adb_dnsdir}/${adb_dnsprefix}.${list}" | uniq -u > "${adb_tmpdir}/tmp.overall"
- mv -f "${adb_tmpdir}/tmp.overall" "${adb_tmpdir}/blocklist.overall"
+ if [ -s "${adb_tmpdir}/blocklist.overall" ]
+ then
+ sort "${adb_tmpdir}/blocklist.overall" "${adb_tmpdir}/blocklist.overall" "${adb_dnsdir}/${adb_dnsprefix}.${list}" | uniq -u > "${adb_tmpdir}/tmp.blocklist"
+ cat "${adb_tmpdir}/tmp.blocklist" > "${adb_dnsdir}/${adb_dnsprefix}.${list}"
+ fi
+ cat "${adb_dnsdir}/${adb_dnsprefix}.${list}" >> "${adb_tmpdir}/blocklist.overall"
done
- rm -f "${adb_tmpdir}/blocklist.overall"
fi
-# restart & check dnsmasq with newly generated set of block lists
+# restart & check dnsmasq with generated set of block lists
#
-if [ -n "${adb_revsrclist}" ] || [ -n "${mv_done}" ] || [ "${rm_done}" = "true" ]
+if [ "${rev_done}" = "true" ] || [ "${rm_done}" = "true" ] || [ -n "${mv_done}" ]
then
"${adb_uci}" -q delete "adblock.global.adb_dnstoggle"
/etc/init.d/dnsmasq restart
@@ -271,28 +251,19 @@ then
check="$(pgrep -f "dnsmasq")"
if [ -n "${check}" ]
then
- dns_ok="true"
- else
- f_log "dnsmasq restart failed, retry without newly generated block lists"
- rm_done="$(find "${adb_dnsdir}" -maxdepth 1 -type f \( ${adb_revsrclist} \) -print -exec rm -f "{}" \;)"
- if [ -n "${rm_done}" ]
- then
- /etc/init.d/dnsmasq restart
- sleep 1
- check="$(pgrep -f "dnsmasq")"
- if [ -n "${check}" ]
- then
- dns_ok="true"
- fi
- fi
- fi
- if [ "${dns_ok}" = "true" ]
- then
f_cntconfig
f_log "block lists with overall ${adb_count} domains loaded"
else
+ f_rmdns
+ sleep 1
+ check="$(pgrep -f "dnsmasq")"
+ if [ -n "${check}" ]
+ then
+ f_log "dnsmasq restart without block lists succeeded, please check your configuration"
+ else
+ f_log "dnsmasq restart without block lists failed, please check your configuration"
+ fi
rc=100
- f_log "dnsmasq restart finally failed, please check 'logread' output"
f_exit
fi
else
