Browse Source

simple-adblock: update to 1.9.1-1

* remove obsolete block-lists from config
* add removal of obsolete lists to config-update
* add AdGuard team's block-list to config
* improve allow command
* improve nftset support
* move config load to uci_load_validate, which required some code refactoring which
  looks dramatic, but isn't
* always use dnsmasq_restart instead of dnsmasq_hup for all dns resolution options
  for dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f8c5fd93e7)
lilik-openwrt-22.03
Stan Grishin 2 years ago
parent
commit
d053da000e
4 changed files with 651 additions and 573 deletions
  1. +1
    -1
      net/simple-adblock/Makefile
  2. +5
    -14
      net/simple-adblock/files/simple-adblock.conf
  3. +2
    -0
      net/simple-adblock/files/simple-adblock.conf.update
  4. +643
    -558
      net/simple-adblock/files/simple-adblock.init

+ 1
- 1
net/simple-adblock/Makefile View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.9.0
PKG_VERSION:=1.9.1
PKG_RELEASE:=1
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later


+ 5
- 14
net/simple-adblock/files/simple-adblock.conf View File

@ -25,22 +25,9 @@ config simple-adblock 'config'
option compressed_cache '0'
list allowed_domain 'cdn.jsdelivr.net'
# Thu Oct 3 17:54:04 PDT 2019
# File size: 4.0K
list blocked_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt'
# File size: 12.0K
list blocked_domains_url 'https://cdn.jsdelivr.net/gh/paulgb/BarbBlock/blacklists/domain-list.txt'
# File size: 44.0K
list blocked_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt'
# File size: 44.0K
list blocked_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt'
# File size: 16.0K
list blocked_hosts_url 'https://adaway.org/hosts.txt'
# File size: 20.0K
list blocked_hosts_url 'https://cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list/hosts.txt'
@ -60,6 +47,10 @@ config simple-adblock 'config'
# block-list may be too big for some routers
list blocked_hosts_url 'https://someonewhocares.org/hosts/hosts'
# File size: 613.0K
# block-list may be too big for some routers
list blocked_domains_url 'https://cdn.jsdelivr.net/gh/AdguardTeam/cname-trackers@master/combined_disguised_trackers_justdomains.txt'
# File size: 624.0K
# block-list too big for most routers
# list blocked_hosts_url 'http://sysctl.org/cameleon/hosts'


+ 2
- 0
net/simple-adblock/files/simple-adblock.conf.update View File

@ -12,3 +12,5 @@ s|http://winhelp2002.mvps.org/hosts.txt|https://winhelp2002.mvps.org/hosts.txt|g
\|dshield.org|d
\|www.malwaredomainlist.com/hostslist/hosts.txt|d
\|https://mirror1.malwaredomains.com/files/justdomains|d
\|lists.disconnect.me|d
\|https://cdn.jsdelivr.net/gh/paulgb/BarbBlock/blacklists/domain-list.txt|d

+ 643
- 558
net/simple-adblock/files/simple-adblock.init
File diff suppressed because it is too large
View File


Loading…
Cancel
Save