From eb398862b5452a2c7021fb8c939efa376e5808cf Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 8 Jun 2020 17:35:32 +0000 Subject: [PATCH] simple-adblock: remove obsolete dshield.org links from config Signed-off-by: Stan Grishin --- net/simple-adblock/Makefile | 8 +++++--- net/simple-adblock/files/simple-adblock.conf | 3 --- net/simple-adblock/files/simple-adblock.conf.update | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index 2c45fe9ee..6187423f2 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.8.3 -PKG_RELEASE:=9 +PKG_RELEASE:=11 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later @@ -16,12 +16,14 @@ define Package/simple-adblock SECTION:=net CATEGORY:=Network TITLE:=Simple AdBlock Service + DEPENDS:=+jshn +jsonfilter PKGARCH:=all endef define Package/simple-adblock/description -This service provides DNSMASQ or Unbound based ad blocking. -Please see the project's README on GitHub for further information. +Simple adblock script to block ad or abuse/malware domains with DNSMASQ or Unbound. +Script supports local/remote list of domains and hosts-files for both black- and white-listing. +Please see https://github.com/openwrt/packages/blob/master/net/simple-adblock/files/README.md for more information. endef diff --git a/net/simple-adblock/files/simple-adblock.conf b/net/simple-adblock/files/simple-adblock.conf index 9bf8d6ea4..627e48114 100644 --- a/net/simple-adblock/files/simple-adblock.conf +++ b/net/simple-adblock/files/simple-adblock.conf @@ -17,9 +17,6 @@ config simple-adblock 'config' # File size: 4.0K list blacklist_domains_url 'https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt' -# File size: 4.0K -# list blacklist_domains_url 'https://www.dshield.org/feeds/suspiciousdomains_High.txt' - # File size: 12.0K list blacklist_domains_url 'https://ssl.bblck.me/blacklists/domain-list.txt' diff --git a/net/simple-adblock/files/simple-adblock.conf.update b/net/simple-adblock/files/simple-adblock.conf.update index 1c1a5a1c5..32f3be068 100644 --- a/net/simple-adblock/files/simple-adblock.conf.update +++ b/net/simple-adblock/files/simple-adblock.conf.update @@ -2,3 +2,4 @@ s|dbl.oisd.nl|hosts.oisd.nl|g s|raw.githubusercontent.com/StevenBlack/hosts/|cdn.jsdelivr.net/gh/StevenBlack/hosts@|g s|raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/|cdn.jsdelivr.net/gh/hoshsadiq/adblock-nocoin-list@|g s|raw.githubusercontent.com/jawz101/MobileAdTrackers/|cdn.jsdelivr.net/gh/jawz101/MobileAdTrackers@|g +/dshield.org/d