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

adblock: bugfix 3.8.14

Browse source 
* fix some whitelist issues (see
https://forum.openwrt.org/t/adblock-support-thread/507/1101)

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2019-12-11 10:39:10 +01:00
parent 6f9cdac55f
commit 5369d0dbbf
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
2 changed files with 5 additions and 4 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
PKG_NAME:=adblock
PKG_VERSION:=3.8.13
PKG_VERSION:=3.8.14
PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

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

@ -13,7 +13,7 @@
#
LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="3.8.13"
adb_ver="3.8.14"
adb_basever=""
adb_enabled=0
adb_debug=0
@ -604,7 +604,7 @@ f_list()
out_rc="${?}"
if [ "${out_rc}" -eq 0 ]
then
adb_whitelist_rset="/^([[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\\.\",\"\\\\.\",\$1);print tolower(\"^\"\$1\"\\\\|\\\\.\"\$1)}"
adb_whitelist_rset="/^([[:alnum:]_-]+\\.)+[[:alpha:]]+([[:space:]]|$)/{gsub(\"\\\\.\",\"\\\\.\",\$1);print tolower(\"^(|.*\\\\.)\"\$1\"$\")}"
awk "${adb_whitelist_rset}" "${adb_tmpdir}/tmp.raw.${mode}" > "${adb_tmpdir}/tmp.rem.${mode}"
out_rc="${?}"
if [ "${out_rc}" -eq 0 ] && [ -n "${adb_dnsallow}" ]
@ -613,6 +613,7 @@ f_list()
out_rc="${?}"
fi
fi
rm -f "${adb_tmpdir}/tmp.raw.${mode}"
fi
;;
"backup")
@ -670,7 +671,7 @@ f_list()
fi
if [ -s "${adb_tmpdir}/tmp.rem.whitelist" ]
then
grep -vf "${adb_tmpdir}/tmp.rem.whitelist" "${adb_tmpdir}/${adb_dnsfile}" | eval "${adb_dnsdeny}" >> "${adb_dnsdir}/${adb_dnsfile}"
egrep -vf "${adb_tmpdir}/tmp.rem.whitelist" "${adb_tmpdir}/${adb_dnsfile}" | eval "${adb_dnsdeny}" >> "${adb_dnsdir}/${adb_dnsfile}"
else
eval "${adb_dnsdeny}" "${adb_tmpdir}/${adb_dnsfile}" >> "${adb_dnsdir}/${adb_dnsfile}"
fi