[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 19614961b6c7b09fe6e0cc91b2d4c3a4df6473a0

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 4245 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  19614961b6c7b09fe6e0cc91b2d4c3a4df6473a0 (commit)
       via  d17d26d7e5a3b23feeb264a2717fb51cc1928db5 (commit)
      from  775a1055a551200bacc121bb82e1d0d2d733b199 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 19614961b6c7b09fe6e0cc91b2d4c3a4df6473a0
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date:   Fri Oct 27 21:49:01 2023 +0200

    zabbix_agentd: Fix ipfire.net.gateway.ping
    
    Fixes custom IPFire Zabbix Agent userparameter ipfire.net.gateway.ping
    returning 1 (success) when fping failed for other reasons (rc 2,3 or 4)
    than host unreachable (rc 0).
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d17d26d7e5a3b23feeb264a2717fb51cc1928db5
Author: Robin Roevens <robin.roevens(a)disroot.org>
Date:   Fri Oct 27 21:40:55 2023 +0200

    zabbix_agentd: Update to 6.0.22 (LTS)
    
    - Update from version 6.0.21 to 6.0.22
    - Update of rootfile not required
    
    Bugs fixed:
    - ZBX-23417: Fixed possible memory leak when checking modbus.get[] item
    New Features and Improvements:
    - ZBXNEXT-6554:	Increased remote command execution limits to 16MB
    
    Full changelogs since 6.0.21:
    - https://www.zabbix.com/rn/rn6.0.22
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/zabbix_agentd/userparameter_ipfire.conf | 2 +-
 lfs/zabbix_agentd                              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf
index b8b512d82..ba0c6c2ca 100644
--- a/config/zabbix_agentd/userparameter_ipfire.conf
+++ b/config/zabbix_agentd/userparameter_ipfire.conf
@@ -3,7 +3,7 @@
 # Internet Gateway ping timings, can be used to measure "Internet Line Quality"
 UserParameter=ipfire.net.gateway.pingtime,sudo /usr/sbin/fping -c 3 gateway 2>&1 | tail -n 1 | awk '{print $NF}' | cut -d '/' -f2
 # Internet Gateway availability, can be used to check Internet connection
-UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? ]; echo $?
+UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? == 0 ]; echo $?
 # Firewall Filter Forward chain drops in bytes/chain (JSON), can be used for discovery of firewall chains and monitoring of firewall hits on each chain
 UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "/\* DROP_.* \*/$" | awk 'BEGIN { ORS = ""; print "["} { printf "%s{\"chain\": \"%s\", \"bytes\": \"%s\"}", separator, substr($11, 6), $2; separator = ", "; } END { print"]" }'
 # Number of currently Active DHCP leases
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 7c0d01150..0033d9a2c 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Zabbix Agent
 
-VER        = 6.0.21
+VER        = 6.0.22
 
 THISAPP    = zabbix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = zabbix_agentd
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = fping
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916bfaf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82
+$(DL_FILE)_BLAKE2 = bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb60225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree