adblock: release 4.2.5-1

* removed needless subshell calls * add memory measurements: - size of the final blocklist in MB - free memory in MB (MemAvailable from /proc/meminfo) - script max. used RAM (VmHWM from /proc/$$/status) * optimized restart logic * cosmetics Signed-off-by: Dirk Brenken <[email protected]>
liudf0716 · Feb 17, 2025 · 162b1e6 · 162b1e6
1 parent 7ff04e9
commit 162b1e6
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 85 deletions.
diff --git a/net/adblock/Makefile b/net/adblock/Makefile
@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=4.2.4
-PKG_RELEASE:=2
+PKG_VERSION:=4.2.5
+PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <[email protected]>
 

diff --git a/net/adblock/files/README.md b/net/adblock/files/README.md
@@ -156,7 +156,7 @@ Available commands:
 | adb_enabled        | 1, enabled                         | set to 0 to disable the adblock service                                                        |
 | adb_srcarc         | -, /etc/adblock/adblock.sources.gz | full path to the used adblock source archive                                                   |
 | adb_srcfile        | -, /tmp/adb_sources.json           | full path to the used adblock source file, which has a higher precedence than the archive file |
-| adb_dns            | -, auto-detected                   | 'dnsmasq', 'unbound', 'named', 'kresd' or 'raw'                                                |
+| adb_dns            | -, auto-detected                   | 'dnsmasq', 'unbound', 'named', 'kresd', 'smartdns' or 'raw'                                    |
 | adb_fetchutil      | -, auto-detected                   | 'uclient-fetch', 'wget', 'curl' or 'aria2c'                                                    |
 | adb_fetchparm      | -, auto-detected                   | manually override the config options for the selected download utility                         |
 | adb_fetchinsecure  | 0, disabled                        | don't check SSL server certificates during download                                            |

diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
@@ -51,6 +51,7 @@ stop_service() {
 }
 
 restart() {
+	rc_procd "${adb_script}" stop
 	rc_procd start_service restart
 }
 

diff --git a/net/adblock/files/adblock.mail b/net/adblock/files/adblock.mail
@@ -1,6 +1,6 @@
 #!/bin/sh
 # send mail script for adblock notifications
-# Copyright (c) 2015-2024 Dirk Brenken ([email protected])
+# Copyright (c) 2015-2025 Dirk Brenken ([email protected])
 # This is free software, licensed under the GNU General Public License v3.
 
 # Please note: you have to manually install and configure the package 'msmtp' before using this script
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ stop_service() { @@
     }
     restart() {
+    	rc_procd "${adb_script}" stop
     	rc_procd start_service restart
     }
@@ Expand Down @@