luci-app-adblock: release 4.0.0

* complete rewrite, migrated to client side JS
* tested with mainline 19.07 and current master
* tested with latest Firefox & Chrome and all
  standard themes (not OpenWrt2020!)
  Pre-tested by many forum users, see here:
  https://forum.openwrt.org/t/adblock-4-pre-releases/57101
* sync translations

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

2 files changed, 87 insertions, 0 deletions

diff --git a/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json b/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json
new file mode 100644
index 0000000000..6faede5b14
--- /dev/null
+++ b/applications/luci-app-adblock/root/usr/share/luci/menu.d/luci-app-adblock.json
@@ -0,0 +1,57 @@
+{
+	"admin/services/adblock": {
+		"title": "Adblock",
+		"order": "60",
+		"action": {
+			"type": "alias",
+			"path": "admin/services/adblock/overview"
+		},
+		"depends": {
+			"fs": {
+				"/usr/bin/adblock.sh": "executable",
+				"/etc/init.d/adblock": "executable"
+			},
+			"uci": { "adblock": true }
+		}
+	},
+	"admin/services/adblock/overview": {
+		"title": "Overview",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "adblock/overview"
+		}
+	},
+	"admin/services/adblock/dnsreport": {
+		"title": "DNS Report",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "adblock/dnsreport"
+		}
+	},
+	"admin/services/adblock/blacklist": {
+		"title": "Edit Blacklist",
+		"order": 30,
+		"action": {
+			"type": "view",
+			"path": "adblock/blacklist"
+		}
+	},
+	"admin/services/adblock/whitelist": {
+		"title": "Edit Whitelist",
+		"order": 40,
+		"action": {
+			"type": "view",
+			"path": "adblock/whitelist"
+		}
+	},
+	"admin/services/adblock/logread": {
+		"title": "Log View",
+		"order": 50,
+		"action": {
+			"type": "view",
+			"path": "adblock/logread"
+		}
+	}
+}
diff --git a/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
new file mode 100644
index 0000000000..557e5328c3
--- /dev/null
+++ b/applications/luci-app-adblock/root/usr/share/rpcd/acl.d/luci-app-adblock.json
@@ -0,0 +1,30 @@
+{
+	"luci-app-adblock": {
+		"description": "Grant access to LuCI app adblock",
+		"write": {
+			"uci": ["adblock"],
+			"file": {
+				"/etc/adblock/*": ["read"],
+				"/etc/adblock/adblock.blacklist": ["write"],
+				"/etc/adblock/adblock.whitelist": ["write"]
+			}
+		},
+		"read": {
+			"cgi-io": [ "exec" ],
+			"file": {
+				"/var/run/adblock.pid": ["read"],
+				"/tmp/adb_runtime.json": ["read"],
+				"/etc/crontabs/root": ["read"],
+				"/sbin/logread -e adblock-": [ "exec" ],
+				"/usr/sbin/logread -e adblock-": [ "exec" ],
+				"/etc/init.d/adblock list" : [ "exec" ],
+				"/etc/init.d/adblock start" : [ "exec" ],
+				"/etc/init.d/adblock suspend" : [ "exec" ],
+				"/etc/init.d/adblock resume" : [ "exec" ],
+				"/etc/init.d/adblock report * [0-9]* [a-z]* json" : [ "exec" ],
+				"/etc/init.d/adblock timer * [0-9]* [0-9*]* [1-7,-*]*" : [ "exec" ],
+				"/etc/init.d/adblock query *" : [ "exec" ]
+			}
+		}
+	}
+}