adblock: 4.1.3-6

* remove discontinued sources: shallalist, stalkerware
* fix a logical glitch in startup trigger handling

Signed-off-by: Dirk Brenken <dev@brenken.org>

net/adblock/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2021 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2015-2022 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 #
 
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.1.3
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

net/adblock/files/README.md

@@ -44,10 +44,8 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | reg_ru              |         | M    | reg_russia       | [Link](https://easylist.to)                                                       |
 | reg_se              |         | M    | reg_sweden       | [Link](https://github.com/lassekongo83/Frellwits-filter-lists)                    |
 | reg_vn              |         | S    | reg_vietnam      | [Link](https://bigdargon.github.io/hostsVN)                                       |
-| shallalist          |         | VAR  | general          | [Link](https://www.shallalist.de)                                                 |
 | smarttv_tracking    |         | S    | tracking         | [Link](https://github.com/Perflyst/PiHoleBlocklist)                               |
 | spam404             |         | S    | general          | [Link](https://github.com/Dawsey21)                                               |
-| stalkerware         |         | S    | tracking         | [Link](https://github.com/astryzia/stalkerware-urls)                              |
 | stevenblack         |         | VAR  | compilation      | [Link](https://github.com/StevenBlack/hosts)                                      |
 | stopforumspam       |         | S    | spam             | [Link](https://www.stopforumspam.com)                                             |
 | utcapitole          |         | VAR  | general          | [Link](https://dsi.ut-capitole.fr/blacklists/index_en.php)                        |

net/adblock/files/adblock.categories

@@ -9,61 +9,6 @@ eng;porn;porn/formats/domains.txt
 eng;spark;spark/formats/domains.txt
 eng;ultimate;ultimate/formats/domains.txt
 eng;unified;unified/formats/domains.txt
-sha;adv
-sha;aggressive
-sha;alcohol
-sha;anonvpn
-sha;automobile
-sha;chat
-sha;costtraps
-sha;dating
-sha;downloads
-sha;drugs
-sha;dynamic
-sha;education
-sha;finance
-sha;fortunetelling
-sha;forum
-sha;gamble
-sha;government
-sha;hacking
-sha;hobby
-sha;homestyle
-sha;hospitals
-sha;imagehosting
-sha;isp
-sha;jobsearch
-sha;library
-sha;military
-sha;models
-sha;movies
-sha;music
-sha;news
-sha;podcasts
-sha;politics
-sha;porn
-sha;radiotv
-sha;recreation
-sha;redirector
-sha;religion
-sha;remotecontrol
-sha;ringtones
-sha;science
-sha;searchengines
-sha;sex
-sha;shopping
-sha;socialnet
-sha;spyware
-sha;tracker
-sha;updatesites
-sha;urlshortener
-sha;violence
-sha;warez
-sha;weapons
-sha;webmail
-sha;webphone
-sha;webradio
-sha;webtv
 stb;fakenews;alternates/fakenews/hosts
 stb;fakenews-gambling;alternates/fakenews-gambling/hosts
 stb;fakenews-gambling-porn;alternates/fakenews-gambling-porn/hosts

net/adblock/files/adblock.init

@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (c) 2015-2021 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2015-2022 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 
 # set (s)hellcheck exceptions
@@ -353,16 +353,6 @@ service_triggers()
 	delay="$(uci_get adblock global adb_triggerdelay "5")"
 	PROCD_RELOAD_DELAY=$((delay*1000))
 
-	if [ -z "${iface}" ]
-	then
-		. "/lib/functions/network.sh"
-		network_find_wan iface
-		if [ -n "${iface}" ]
-		then
-			uci_set adblock global adb_trigger "${iface}"
-			uci_commit "adblock"
-		fi
-	fi
 	if [ -n "${iface}" ]
 	then
 		procd_add_interface_trigger "interface.*.up" "${iface}" "${adb_init}" "start"

net/adblock/files/adblock.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # dns based ad/abuse domain blocking
-# Copyright (c) 2015-2021 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2015-2022 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 
 # set (s)hellcheck exceptions
@@ -217,9 +217,6 @@ f_conf()
 			elif [ "${option}" = "adb_eng_sources" ]
 			then
 				eval "${option}=\"$(printf "%s" "${adb_eng_sources}") ${value}\""
-			elif [ "${option}" = "adb_sha_sources" ]
-			then
-				eval "${option}=\"$(printf "%s" "${adb_sha_sources}") ${value}\""
 			elif [ "${option}" = "adb_stb_sources" ]
 			then
 				eval "${option}=\"$(printf "%s" "${adb_stb_sources}") ${value}\""
@@ -1486,15 +1483,9 @@ f_main()
 		# download queue processing
 		#
 		unset src_cat src_entries
-		if [ "${src_name}" = "shallalist" ] || [ "${src_name}" = "utcapitole" ]
+		if [ "${src_name}" = "utcapitole" ] && [ -n "${adb_utc_sources}" ]
 		then
-			if [ "${src_name}" = "shallalist" ] && [ -n "${adb_sha_sources}" ]
-			then
-				src_cat="${adb_sha_sources}"
-			elif [ "${src_name}" = "utcapitole" ] && [ -n "${adb_utc_sources}" ]
-			then
-				src_cat="${adb_utc_sources}"
-			fi
+			src_cat="${adb_utc_sources}"
 			if [ -n "${src_cat}" ]
 			then
 				(

net/adblock/files/adblock.sources

@@ -237,13 +237,6 @@
 		"focus": "reg_vietnam",
 		"descurl": "https://bigdargon.github.io/hostsVN"
 	},
-	"shallalist": {
-		"url": "https://www.shallalist.de/Downloads/shallalist.tar.gz",
-		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
-		"size": "VAR",
-		"focus": "general",
-		"descurl": "https://www.shallalist.de"
-	},
 	"smarttv_tracking": {
 		"url": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt",
 		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
@@ -258,13 +251,6 @@
 		"focus": "general",
 		"descurl": "https://github.com/Dawsey21"
 	},
-	"stalkerware": {
-		"url": "https://raw.githubusercontent.com/astryzia/stalkerware-urls/main/stalkerware_urls.txt",
-		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
-		"size": "S",
-		"focus": "tracking",
-		"descurl": "https://github.com/astryzia/stalkerware-urls"
-	},
 	"stevenblack": {
 		"url": "https://raw.githubusercontent.com/StevenBlack/hosts/master/",
 		"rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",