From ab44d8146af2abcfd96f08aba99358e960049bd3 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Sun, 31 May 2020 18:28:27 +0200
Subject: [PATCH] adblock: update 4.0.5-4

* 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>
---
 net/adblock/Makefile              |  2 +-
 net/adblock/files/README.md       |  1 +
 net/adblock/files/adblock.init    | 12 +++++-------
 net/adblock/files/adblock.sources |  7 +++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index a706fec05..9d5237823 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.0.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 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
index f399cb8e1..826913a95 100644
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -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_es              |         | M    | reg_espania      | [Link](https://easylist.to)                                      |
 | 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_nl              |         | M    | reg_netherlands  | [Link](https://easylist.to)                                      |
 | reg_pl              |         | M    | reg_poland       | [Link](https://kadantiscam.netlify.com)                          |
diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index 3471cc8df..780e3b6bd 100755
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -114,19 +114,17 @@ list()
 		if [ -n "$(uci -q changes adblock)" ]
 		then
 			uci_commit adblock
+			"${adb_init}" start
 		fi
 	else
 		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_enabled="$(uci -q show adblock.global.adb_sources)"
-		if [ ! -r "${src_file}" ]
+		if [ -r "${src_archive}" ]
 		then
-			if [ -r "${src_archive}" ]
-			then
-				zcat "${src_archive}" > "${src_file}"
-			else
-				printf "%s\\n" "::: adblock source archive '${src_archive}' not found"
-			fi
+			zcat "${src_archive}" > "${src_file}"
+		else
+			printf "%s\\n" "::: adblock source archive '${src_archive}' not found"
 		fi
 		if [ -r "${src_file}" ]
 		then
diff --git a/net/adblock/files/adblock.sources b/net/adblock/files/adblock.sources
index 1a8a2b11d..e9da27698 100644
--- a/net/adblock/files/adblock.sources
+++ b/net/adblock/files/adblock.sources
@@ -153,6 +153,13 @@
 		"focus": "reg_finland",
 		"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": {
 		"url": "https://easylist-downloads.adblockplus.org/abpindo+easylist.txt",
 		"rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",