From 097633fb1f1adbd8d6b2c79d38e3876abae9315b Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 14 Jul 2019 22:13:49 +0200 Subject: [PATCH] adblock: update 3.6.5-2 * clean-up config - remove youtube source (not working, false positives) - remove urlhaus source (false positives) - remove zeus source (discontinued) Signed-off-by: Dirk Brenken (cherry picked from commit 1d81adc003071d9ac3d6afcb99c6bef5fe407822) --- net/adblock/Makefile | 2 +- net/adblock/files/README.md | 6 ------ net/adblock/files/adblock.conf | 20 -------------------- net/adblock/files/adblock.sh | 2 +- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/net/adblock/Makefile b/net/adblock/Makefile index 7e4dff09aa..79ffea4a08 100644 --- a/net/adblock/Makefile +++ b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock PKG_VERSION:=3.6.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md index a5fbead52f..36eeee4129 100644 --- a/net/adblock/files/README.md +++ b/net/adblock/files/README.md @@ -51,20 +51,14 @@ A lot of people already use adblocker plugins within their desktop browsers, but * => weekly updates, approx. 21.000 entries * [ut_capitole](https://dsi.ut-capitole.fr/blacklists) (categories "cryptojacking" "ddos" "malware" "phishing" "warez" enabled by default) * => daily updates, approx. 64.000 entries (a short description of all categories can be found [online](https://dsi.ut-capitole.fr/blacklists/index_en.php)) - * [urlhaus](https://urlhaus.abuse.ch) - * => numerous updates on the same day, approx. 3.500 entries * [whocares](http://someonewhocares.org) * => weekly updates, approx. 12.000 entries * [winhelp](http://winhelp2002.mvps.org) * => infrequent updates, approx. 15.000 entries * [winspy](https://github.com/crazy-max/WindowsSpyBlocker) * => infrequent updates, approx. 120 entries - * [youtube](https://api.hackertarget.com/hostsearch/?q=googlevideo.com) - * => dynamic request API to filter "random" youtube ad domains (experimental!), approx. 150 entries * [yoyo](http://pgl.yoyo.org/adservers) * => weekly updates, approx. 2.500 entries (enabled by default) - * [zeus tracker](https://zeustracker.abuse.ch) - * => daily updates, approx. 440 entries * zero-conf like automatic installation & setup, usually no manual changes needed * simple but yet powerful adblock engine: adblock does not use error prone external iptables rulesets, http pixel server instances and things like that * supports five different dns backends / blocklist formats: dnsmasq, unbound, named (bind), kresd and dnscrypt-proxy diff --git a/net/adblock/files/adblock.conf b/net/adblock/files/adblock.conf index 0b620593f4..8b47627d41 100644 --- a/net/adblock/files/adblock.conf +++ b/net/adblock/files/adblock.conf @@ -1,5 +1,3 @@ -# adblock configuration, for further information -# see 'https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md' config adblock 'global' option adb_enabled '0' @@ -151,12 +149,6 @@ config source 'sysctl' option adb_src_desc 'broad blocklist, weekly updates, approx. 16.500 entries' option enabled '0' -config source 'urlhaus' - option adb_src 'https://urlhaus.abuse.ch/downloads/rpz' - option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)+/{print tolower(\$1)}' - option adb_src_desc 'urlhaus RPZ domains by abuse.ch, numerous updates on the same day, approx. 3.500 entries' - option enabled '0' - config source 'ut_capitole' option adb_src 'https://dsi.ut-capitole.fr/blacklists/download/blacklists.tar.gz' option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}' @@ -187,20 +179,8 @@ config source 'winhelp' option adb_src_desc 'broad blocklist, infrequent updates, approx. 13.000 entries' option enabled '0' -config source 'youtube' - option adb_src 'https://api.hackertarget.com/hostsearch/?q=googlevideo.com' - option adb_src_rset 'BEGIN{FS=\",\"}/^(r[0-9]+\.){1,1}([[:alnum:]_-]+\.)+[[:alpha:]]+/{sub(/\./,\"---\");print tolower(\$1)}' - option adb_src_desc 'focus on youtube ad-related subdomains, dynamic request API, approx. 150 entries' - option enabled '0' - config source 'yoyo' option adb_src 'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&showintro=0&mimetype=plaintext' option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}' option adb_src_desc 'focus on ad related domains, weekly updates, approx. 2.400 entries' option enabled '1' - -config source 'zeus' - option adb_src 'https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist' - option adb_src_rset '/^([[:alnum:]_-]+\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower(\$1)}' - option adb_src_desc 'focus on zeus botnet by abuse.ch, daily updates, approx. 400 entries' - option enabled '0' diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh index 6b235c6257..24e58b28f3 100755 --- a/net/adblock/files/adblock.sh +++ b/net/adblock/files/adblock.sh @@ -10,7 +10,7 @@ # LC_ALL=C PATH="/usr/sbin:/usr/bin:/sbin:/bin" -adb_ver="3.6.5" +adb_ver="3.6.5-2" adb_sysver="unknown" adb_enabled=0 adb_debug=0 -- 2.30.2