projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4d0bb9)
banip: update 0.9.3-4
authorDirk Brenken <dev@brenken.org>
Sun, 7 Jan 2024 17:10:49 +0000 (18:10 +0100)
committerDirk Brenken <dev@brenken.org>
Sun, 7 Jan 2024 17:11:52 +0000 (18:11 +0100)
* made the default mail template "responsive" to get a better view esp. on mobile devices

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 6c9cd775962a3165b70ab7722ba1c6a98b3b5f15)

net/banip/Makefile patch | blob | history
net/banip/files/banip.tpl patch | blob | history

diff --git a/net/banip/Makefile b/net/banip/Makefile
index ca01ea048d4e3e1a88ccb9ed0ad428d3a31971d4..d9b58c5270f2c44a4fd8c5002bb8784e4ec29c2a 100644 (file)
--- a/net/banip/Makefile
+++ b/net/banip/Makefile
@@ -1,12 +1,12 @@
 # banIP - ban incoming and outgoing IPs via named nftables Sets
-# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=banip
 PKG_VERSION:=0.9.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
diff --git a/net/banip/files/banip.tpl b/net/banip/files/banip.tpl
index 2b3c20ff2cba390df632a8e958083a22d74073c5..924ffe0b68a418cf9f44aeedee1d214a07f07a5f 100644 (file)
--- a/net/banip/files/banip.tpl
+++ b/net/banip/files/banip.tpl
@@ -1,5 +1,5 @@
 # banIP mail template/include - ban incoming and outgoing IPs via named nftables Sets
-# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
+# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
 # This is free software, licensed under the GNU General Public License v3.
 
 # info preparation
@@ -12,9 +12,9 @@ elif printf "%s" "${ban_packages}" | "${ban_grepcmd}" -q '"logd'; then
        logread_cmd="${ban_logreadcmd} -l ${ban_loglimit} -e "banIP/" 2>/dev/null"
 fi
 
-banip_info="$(/etc/init.d/banip status 2>/dev/null | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
+banip_info="$(/etc/init.d/banip status 2>/dev/null)"
 report_info="$("${ban_catcmd}" "${ban_reportdir}/ban_report.txt" 2>/dev/null)"
-log_info="$(${logread_cmd} | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
+log_info="$(${logread_cmd})"
 system_info="$(
        strings /etc/banner 2>/dev/null
        "${ban_ubuscmd}" call system board | "${ban_awkcmd}" 'BEGIN{FS="[{}\"]"}{if($2=="kernel"||$2=="hostname"||$2=="system"||$2=="model"||$2=="description")printf "  + %-12s: %s\n",$2,$4}'
@@ -22,7 +22,7 @@ system_info="$(
 
 # content header
 #
-mail_text="$(printf "%s\n" "<html><body><pre style='display:block;font-family:monospace;font-size:1rem;padding:20;background-color:#f3eee5;white-space:pre'>")"
+mail_text="$(printf "%s\n" "<html><body><pre style='font-family:monospace;padding:20;background-color:#f3eee5;white-space:pre-wrap;overflow-x:auto;' >")"
 
 # content body
 #
Mirror of packages feed