banip: release 0.8.5-2
authorDirk Brenken <dev@brenken.org>
Mon, 8 May 2023 07:17:07 +0000 (09:17 +0200)
committerDirk Brenken <dev@brenken.org>
Mon, 8 May 2023 07:17:07 +0000 (09:17 +0200)
* fixed a log parser regression introduced in latest 0.8.4 update

Signed-off-by: Dirk Brenken <dev@brenken.org>
net/banip/Makefile
net/banip/files/banip-service.sh

index 07bad221346441109f6a948bd2c16134e2cc225c..fe74a723d399bbf2baa204407a9f7a05fd599805 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.8.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
index aadeae380e5dc3c04be6e0180e85a8aa48df33e8..b67c5a0aac8f9ecfe1ca0ed5144c3e1bd6416b4b 100755 (executable)
@@ -192,7 +192,7 @@ if [ -x "${ban_logreadcmd}" ] && [ -n "${ban_logterm%%??}" ] && [ "${ban_loglimi
                        if [ -n "${proto}" ] && ! "${ban_nftcmd}" get element inet banIP blocklist"${proto}" "{ ${ip} }" >/dev/null 2>&1; then
                                f_log "info" "suspicious IP${proto} '${ip}'"
                                log_raw="$("${ban_logreadcmd}" -l "${ban_loglimit}" 2>/dev/null)"
-                               log_count="$(printf "%s\n" "${log_raw}" | grep -c "found '${ip}'")"
+                               log_count="$(printf "%s\n" "${log_raw}" | grep -c "suspicious IP${proto} '${ip}'")"
                                if [ "${log_count}" -ge "${ban_logcount}" ]; then
                                        if "${ban_nftcmd}" add element inet banIP "blocklist${proto}" "{ ${ip} ${nft_expiry} }" >/dev/null 2>&1; then
                                                f_log "info" "add IP${proto} '${ip}' (expiry: ${nft_expiry:-"-"}) to blocklist${proto} set"