adblock: release 4.2.6-1

* removed needless 'adb_mailcnt' option
* fixed blocklist count formatting

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

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index 36d7fd7fa1b158c6c380f48e1acac3a79551f40a..c27fef94c15c1ea2fa7f7b4308e172267f0a4c4f 100644 (file)
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
-PKG_VERSION:=4.2.5
+PKG_VERSION:=4.2.6
 PKG_RELEASE:=1
 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 7f99e7108bdfb32e4252f95ee24ec37ac1c51bce..fc7fab9b4cb75ad1b4e79f756db3632494c5b54b 100644 (file)
--- a/net/adblock/files/README.md
+++ b/net/adblock/files/README.md
@@ -191,7 +191,6 @@ Available commands:
 | adb_mailsender     | no-reply@adblock                   | sender address for adblock notification E-Mails                                                |
 | adb_mailtopic      | adblock notification          | topic for adblock notification E-Mails                                                         |
 | adb_mailprofile    | adb_notify                         | mail profile used in 'msmtp' for adblock notification E-Mails                                  |
-| adb_mailcnt        | 0                                  | minimum domain count to trigger E-Mail notifications                                           |
 | adb_jail           | 0                                  | set to 1 to enable the additional, restrictive 'adb_list.jail' creation                        |
 | adb_jaildir        | /tmp                               | path for the generated jail list                                                               |
 

diff --git a/net/adblock/files/adblock.sh b/net/adblock/files/adblock.sh
index 0166b09b18438047e54af57ad202065473d7fd65..4ae538f5c8a92d98e98a98561f822acc8c9f54b3 100755 (executable)
--- a/net/adblock/files/adblock.sh
+++ b/net/adblock/files/adblock.sh
@@ -23,7 +23,6 @@ adb_trigger=""
 adb_triggerdelay="5"
 adb_backup="1"
 adb_mail="0"
-adb_mailcnt="0"
 adb_jail="0"
 adb_tld="1"
 adb_dns=""
@@ -1011,7 +1010,7 @@ f_jsnup() {
        fi
        mem_free="$("${adb_awkcmd}" '/^MemAvailable/{printf "%.2f", $2/1024}' "/proc/meminfo" 2>/dev/null)"
        mem_max="$("${adb_awkcmd}" '/^VmHWM/{printf "%.2f", $2/1024}' "/proc/${$}/status" 2>/dev/null)"
-       adb_cnt="$("${adb_awkcmd}" -v cnt="${adb_cnt}" 'BEGIN{res="";pos=0;for(i=length(cnt);i>0;i--){res=substr(cnt,i,1)res;pos++;if(pos==3&&i>1){res="."res;pos=0;}}; printf"%s",res}')"
+       adb_cnt="$("${adb_awkcmd}" -v cnt="${adb_cnt}" 'BEGIN{res="";pos=0;for(i=length(cnt);i>0;i--){res=substr(cnt,i,1)res;pos++;if(pos==3&&i>1){res=" "res;pos=0;}}; printf"%s",res}')"
 
        case "${status}" in
                "enabled" | "error")
@@ -1063,8 +1062,7 @@ f_jsnup() {
        json_add_string "system" "${adb_sysver}"
        json_dump >"${adb_rtfile}"
 
-       if [ "${adb_mail}" = "1" ] && [ -x "${adb_mailservice}" ] &&
-               [ "${status}" = "enabled" ] && [ "${adb_cnt}" -le "${adb_mailcnt}" ]; then
+       if [ "${adb_mail}" = "1" ] && [ -x "${adb_mailservice}" ] && [ "${status}" = "enabled" ]; then
                "${adb_mailservice}" >/dev/null 2>&1
        fi
 }