Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adblock: update 4.0.5-4

Browse source 
* remove dumb list cache
* start adblock processing after adding/removing
  list sources via CLI
* add regional list source for france

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2020-05-31 18:28:27 +02:00
parent f785b219cd
commit ab44d8146a
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/adblock/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=4.0.5 PKG_VERSION:=4.0.5
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

1
net/adblock/files/README.md
View file

@ -30,6 +30,7 @@ A lot of people already use adblocker plugins within their desktop browsers, but
| reg_de | | M | reg_germany | [Link](https://easylist.to) | | reg_de | | M | reg_germany | [Link](https://easylist.to) |
| reg_es | | M | reg_espania | [Link](https://easylist.to) | | reg_es | | M | reg_espania | [Link](https://easylist.to) |
| reg_fi | | S | reg_finland | [Link](https://github.com/finnish-easylist-addition) | | reg_fi | | S | reg_finland | [Link](https://github.com/finnish-easylist-addition) |
| reg_fr | | S | reg_france | [Link](https://forums.lanik.us/viewforum.php?f=91) |
| reg_id | | M | reg_indonesia | [Link](https://easylist.to) | | reg_id | | M | reg_indonesia | [Link](https://easylist.to) |
| reg_nl | | M | reg_netherlands | [Link](https://easylist.to) | | reg_nl | | M | reg_netherlands | [Link](https://easylist.to) |
| reg_pl | | M | reg_poland | [Link](https://kadantiscam.netlify.com) | | reg_pl | | M | reg_poland | [Link](https://kadantiscam.netlify.com) |

12
net/adblock/files/adblock.init
View file

@ -114,19 +114,17 @@ list()
if [ -n "$(uci -q changes adblock)" ] if [ -n "$(uci -q changes adblock)" ]
then then
uci_commit adblock uci_commit adblock
"${adb_init}" start
fi fi
else else
src_archive="$(uci_get adblock global adb_srcarc "/etc/adblock/adblock.sources.gz")" src_archive="$(uci_get adblock global adb_srcarc "/etc/adblock/adblock.sources.gz")"
src_file="$(uci_get adblock global adb_srcfile "/tmp/adb_sources.json")" src_file="$(uci_get adblock global adb_srcfile "/tmp/adb_sources.json")"
src_enabled="$(uci -q show adblock.global.adb_sources)" src_enabled="$(uci -q show adblock.global.adb_sources)"
if [ ! -r "${src_file}" ] if [ -r "${src_archive}" ]
then then
if [ -r "${src_archive}" ] zcat "${src_archive}" > "${src_file}"
then else
zcat "${src_archive}" > "${src_file}" printf "%s\\n" "::: adblock source archive '${src_archive}' not found"
else
printf "%s\\n" "::: adblock source archive '${src_archive}' not found"
fi
fi fi
if [ -r "${src_file}" ] if [ -r "${src_file}" ]
then then

7
net/adblock/files/adblock.sources
View file

@ -153,6 +153,13 @@
"focus": "reg_finland", "focus": "reg_finland",
"descurl": "https://github.com/finnish-easylist-addition" "descurl": "https://github.com/finnish-easylist-addition"
}, },
"reg_fr": {
"url": "https://easylist-downloads.adblockplus.org/liste_fr.txt",
"rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
"size": "S",
"focus": "reg_france",
"descurl": "https://forums.lanik.us/viewforum.php?f=91"
},
"reg_id": { "reg_id": {
"url": "https://easylist-downloads.adblockplus.org/abpindo+easylist.txt", "url": "https://easylist-downloads.adblockplus.org/abpindo+easylist.txt",
"rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}", "rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",