From 09d8181ef75dd04df69e8c3f23fe8467a0958183 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Fri, 17 Apr 2026 09:59:11 +0200 Subject: [PATCH] luci-app-adblock: release 4.5.5-1 * sync with base package Signed-off-by: Dirk Brenken --- applications/luci-app-adblock/Makefile | 2 +- .../luci-static/resources/view/adblock/dnsreport.js | 8 ++++---- .../htdocs/luci-static/resources/view/adblock/overview.js | 4 ++-- .../root/usr/share/rpcd/acl.d/luci-app-adblock.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 10bedcb738..8e3eaf7b16 100644 --- 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 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 8615229a3f..fe454a9526 100644 --- 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 53f48f2689..4cabd9e6c0 100644 --- 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 a1aa6c436d..35f3576600 100644 --- 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": [