luci-app-adblock: release 4.5.5-1

* sync with base package

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 10bedcb73838cc4cc3c3f42f75256c6ca85cb698..8e3eaf7b16f6ab1047700b52ce36fa8506b9b22a 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 LUCI_TITLE:=LuCI support for Adblock
 LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock
 
-PKG_VERSION:=4.5.4
+PKG_VERSION:=4.5.5
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
index 8615229a3ff3ef7bbbd28fa99d94eae822dfc489..fe454a95268c880cc866fa436114829725846133 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
@@ -132,12 +132,12 @@ function handleAction(ev) {
                                                                clearInterval(window._adbSearchPoller);
                                                                window._adbSearchPoller = null;
                                                        }
-                                                       L.resolveDefault(fs.write('/var/run/adblock.search', ''), '').then(function () {
+                                                       L.resolveDefault(fs.write('/var/run/adblock/adblock.search', ''), '').then(function () {
                                                                L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['search', domain]), '');
                                                                let attempts = 0;
                                                                window._adbSearchPoller = setInterval(function () {
                                                                        attempts++;
-                                                                       L.resolveDefault(fs.read('/var/run/adblock.search'), '').then(function (res) {
+                                                                       L.resolveDefault(fs.read('/var/run/adblock/adblock.search'), '').then(function (res) {
                                                                                if (res && res.trim()) {
                                                                                        clearInterval(window._adbSearchPoller);
                                                                                        window._adbSearchPoller = null;
@@ -213,12 +213,12 @@ function handleAction(ev) {
                                                const top_count = document.getElementById('top_count').value;
                                                const res_count = document.getElementById('res_count').value;
                                                const search = document.getElementById('search').value.trim().replace(/[^\w.\-:]/g, '') || '+';
-                                               L.resolveDefault(fs.write('/var/run/adblock.report', ''), '').then(function () {
+                                               L.resolveDefault(fs.write('/var/run/adblock/adblock.report', ''), '').then(function () {
                                                        L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['report', 'gen', top_count, res_count, search]), '');
                                                        let attempts = 0;
                                                        let poller = setInterval(function () {
                                                                attempts++;
-                                                               L.resolveDefault(fs.read('/var/run/adblock.report'), '').then(function (res) {
+                                                               L.resolveDefault(fs.read('/var/run/adblock/adblock.report'), '').then(function (res) {
                                                                        if (res && res.trim()) {
                                                                                clearInterval(poller);
                                                                                ui.hideModal();

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 53f48f26897a88da8ce8e978df1a3c3ffa4842eb..4cabd9e6c080a39d0d90a04c950b2a0219420fb8 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -80,11 +80,11 @@ return view.extend({
                */
                let parseErrCount = 0;
                poll.add(function () {
-                       return L.resolveDefault(fs.stat('/var/run/adb_runtime.json'), null).then(function (stat) {
+                       return L.resolveDefault(fs.stat('/var/run/adblock/adblock.runtime.json'), null).then(function (stat) {
                                if (!stat) {
                                        return;
                                }
-                               return L.resolveDefault(fs.read_direct('/var/run/adb_runtime.json'), null).then(function (res) {
+                               return L.resolveDefault(fs.read_direct('/var/run/adblock/adblock.runtime.json'), null).then(function (res) {
                                        const status = document.getElementById('status');
                                        const buttons = document.querySelectorAll('.cbi-page-actions button');
                                        let info = null;

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
index a1aa6c436d30d6a9c34b7f6be8463410f5832eed..35f3576600dec561e4d0c65b72bf97b68318c0a5 100644 (file)
--- 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
@@ -21,11 +21,11 @@
                                        "read",
                                        "write"
                                ],
-                               "/var/run/adblock.search": [
+                               "/var/run/adblock/adblock.search": [
                                        "read",
                                        "write"
                                ],
-                               "/var/run/adblock.report": [
+                               "/var/run/adblock/adblock.report": [
                                        "read",
                                        "write"
                                ]
@@ -36,10 +36,10 @@
                                "exec"
                        ],
                        "file": {
-                               "/var/run/adblock.pid": [
+                               "/var/run/adblock/adblock.pid": [
                                        "read"
                                ],
-                               "/var/run/adb_runtime.json": [
+                               "/var/run/adblock/adblock.runtime.json": [
                                        "read"
                                ],
                                "/etc/init.d/adblock reload": [