adblock: update 4.1.5-5

* adapted changed oisd namings / download locations oisd_big (old: oisd_full), oisd_small (old: oisdb_basic) * added antipopads as new sources * removed broken energized source * fixed readme Signed-off-by: Dirk Brenken <dev@brenken.org>
openwrt · Feb 15, 2023 · 51634a9 · 51634a9
1 parent c7d23af
commit 51634a9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 31 deletions.
diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -1,13 +1,13 @@
 #
-# Copyright (c) 2015-2022 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2015-2023 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.1.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
@@ -16,22 +16,22 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 | android_tracking    |         | S    | tracking         | [Link](https://github.com/Perflyst/PiHoleBlocklist)                               |
 | andryou             |         | L    | compilation      | [Link](https://gitlab.com/andryou/block/-/blob/master/readme.md)                  |
 | anti_ad             |         | L    | compilation      | [Link](https://github.com/privacy-protection-tools/anti-AD/blob/master/README.md) |
+| antipopads          |         | L    | compilation      | [Link](https://github.com/AdroitAdorKhan/antipopads-re)                           |
 | anudeep             |         | M    | compilation      | [Link](https://github.com/anudeepND/blacklist)                                    |
 | bitcoin             |         | S    | mining           | [Link](https://github.com/hoshsadiq/adblock-nocoin-list)                          |
 | cpbl                |         | XL   | compilation      | [Link](https://github.com/bongochong/CombinedPrivacyBlockLists)                   |
 | disconnect          | x       | S    | general          | [Link](https://disconnect.me)                                                     |
 | doh_blocklist       |         | S    | doh_server       | [Link](https://github.com/dibdot/DoH-IP-blocklists)                               |
 | easylist            |         | M    | compilation      | [Link](https://easylist.to)                                                       |
 | easyprivacy         |         | M    | tracking         | [Link](https://easylist.to)                                                       |
-| energized           |         | VAR  | compilation      | [Link](https://energized.pro)                                                     |
 | firetv_tracking     |         | S    | tracking         | [Link](https://github.com/Perflyst/PiHoleBlocklist)                               |
 | games_tracking      |         | S    | tracking         | [Link](https://www.gameindustry.eu)                                               |
 | hblock              |         | XL   | compilation      | [Link](https://hblock.molinero.dev)                                               |
 | lightswitch05       |         | XL   | compilation      | [Link](https://github.com/lightswitch05/hosts)                                    |
 | notracking          |         | XL   | tracking         | [Link](https://github.com/notracking/hosts-blocklists)                            |
-| oisd_basic          |         | L    | general          | [Link](https://oisd.nl)                                                           |
+| oisd_big            |         | XXL  | general          | [Link](https://oisd.nl)                                                           |
 | oisd_nsfw           |         | XL   | general          | [Link](https://oisd.nl)                                                           |
-| oisd_full           |         | XXL  | general          | [Link](https://oisd.nl)                                                           |
+| oisd_small          |         | L    | general          | [Link](https://oisd.nl)                                                           |
 | openphish           |         | S    | phishing         | [Link](https://openphish.com)                                                     |
 | phishing_army       |         | S    | phishing         | [Link](https://phishing.army)                                                     |
 | reg_cn              |         | S    | reg_china        | [Link](https://easylist.to)                                                       |
@@ -79,7 +79,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
 * Full IPv4 and IPv6 support
 * Provides top level domain compression ('tld compression'), this feature removes thousands of needless host entries from the blocklist and lowers the memory footprint for the DNS backend
 * Provides a 'DNS File Reset', where the generated DNS blocklist file will be purged after DNS backend loading to save storage space
-* Source parsing by fast & flexible regex rulesets, all rules and source information are placed in an external/compredd JSON file ('/etc/adblock/adblock.sources.gz') 
+* Source parsing by fast & flexible regex rulesets, all rules and source information are placed in an external/compredd JSON file ('/etc/adblock/adblock.sources.gz')
 * Overall duplicate removal in generated blocklist file 'adb_list.overall'
 * Additional local blacklist for manual overrides, located in '/etc/adblock/adblock.blacklist'
 * Additional local whitelist for manual overrides, located in '/etc/adblock/adblock.whitelist'
@@ -302,7 +302,7 @@ A valid JSON source object contains the following required information, e.g.:
 	},
 	[...]
 </code></pre>
-Add an unique object name, make the required changes to 'url', 'rule', 'size' and 'descurl' and finally compress the changed JSON file _gzip /etc/adblock/adblock.sources.gz_ to use the new source object in adblock.  
+Add an unique object name, make the required changes to 'url', 'rule', 'size' and 'descurl' and finally compress the changed JSON file _gzip /etc/adblock/adblock.sources_ to use the new source object in adblock.  
 <b>Please note:</b> if you're going to add new sources on your own, please make a copy of the default file and work with that copy further on, cause the default will be overwritten with every adblock update. To reference your copy set the option 'adb\_srcarc' which points by default to '/etc/adblock/adblock.sources.gz'  
 <b>Please note:</b> when adblock starts, it looks for the uncompressed 'adb\_srcfile', only if this file is not found the archive 'adb\_srcarc' is unpacked once and then the uncompressed file is used
 

diff --git a/net/adblock/files/adblock.categories b/net/adblock/files/adblock.categories
@@ -1,14 +1,3 @@
-eng;basic;basic/formats/domains.txt
-eng;blu;blu/formats/domains.txt
-eng;blugo;bluGo/formats/domains.txt
-eng;ext-extreme;extensions/xtreme/formats/domains.txt
-eng;ext-pornlite;extensions/porn-lite/formats/domains.txt
-eng;ext-regional;extensions/regional/formats/domains.txt
-eng;ext-social;extensions/social/formats/domains.txt
-eng;porn;porn/formats/domains.txt
-eng;spark;spark/formats/domains.txt
-eng;ultimate;ultimate/formats/domains.txt
-eng;unified;unified/formats/domains.txt
 stb;fakenews;alternates/fakenews/hosts
 stb;fakenews-gambling;alternates/fakenews-gambling/hosts
 stb;fakenews-gambling-porn;alternates/fakenews-gambling-porn/hosts

diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
@@ -41,6 +41,13 @@
 		"focus": "compilation",
 		"descurl": "https://github.com/privacy-protection-tools/anti-AD/blob/master/README.md"
 	},
+	"antipopads": {
+		"url": "https://raw.githubusercontent.com/AdroitAdorKhan/antipopads-re/master/formats/domains.txt",
+		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+		"size": "L",
+		"focus": "compilation",
+		"descurl": "https://github.com/AdroitAdorKhan/antipopads-re"
+	},
 	"anudeep": {
 		"url": "https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt",
 		"rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
@@ -90,13 +97,6 @@
 		"focus": "tracking",
 		"descurl": "https://easylist.to"
 	},
-	"energized": {
-		"url": "https://block.energized.pro/",
-		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
-		"size": "VAR",
-		"focus": "compilation",
-		"descurl": "https://energized.pro"
-	},
 	"firetv_tracking": {
 		"url": "https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/AmazonFireTV.txt",
 		"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
@@ -132,10 +132,10 @@
 		"focus": "tracking",
 		"descurl": "https://github.com/notracking/hosts-blocklists"
 	},
-	"oisd_basic": {
-		"url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_basic.txt",
+	"oisd_big": {
+		"url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_big.txt",
 		"rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
-		"size": "L",
+		"size": "XXL",
 		"focus": "general",
 		"descurl": "https://oisd.nl"
 	},
@@ -146,10 +146,10 @@
 		"focus": "general",
 		"descurl": "https://oisd.nl"
 	},
-	"oisd_full": {
-		"url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_full.txt",
+	"oisd_small": {
+		"url": "https://raw.githubusercontent.com/sjhgvr/oisd/main/dblw_small.txt",
 		"rule": "BEGIN{FS=\"\\\\*.\"}/^\\*\\.([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
-		"size": "XXL",
+		"size": "L",
 		"focus": "general",
 		"descurl": "https://oisd.nl"
 	},