From: Alex Koch <ipfire@starkstromkonsument.de>
Date: Sun, 1 Sep 2019 21:34:58 +0000 (+0200)
Subject: zabbix_agentd: Update to 4.2.6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f98a58b25d1c985d0de194b2333ee762b82358;p=people%2Fstevee%2Fipfire-2.x.git

zabbix_agentd: Update to 4.2.6

Release Notes: https://www.zabbix.com/rn/rn4.2.6

Signed-off-by: Alex Koch <ipfire@starkstromkonsument.de>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/zabbix_agentd.conf
index 07f71c1843..21b8e0122b 100644
--- a/config/zabbix_agentd/zabbix_agentd.conf
+++ b/config/zabbix_agentd/zabbix_agentd.conf
@@ -305,8 +305,12 @@ LoadModulePath=/usr/lib/zabbix
 
 ### Option: LoadModule
 #	Module to load at agent startup. Modules are used to extend functionality of the agent.
-#	Format: LoadModule=<module.so>
-#	The modules must be located in directory specified by LoadModulePath.
+#	Formats:
+#		LoadModule=<module.so>
+#		LoadModule=<path/module.so>
+#		LoadModule=</abs_path/module.so>
+#	Either the module must be located in directory specified by LoadModulePath or the path must precede the module name.
+#	If the preceding path is absolute (starts with '/') then LoadModulePath is ignored.
 #	It is allowed to include multiple LoadModule parameters.
 #
 # Mandatory: no
@@ -353,14 +357,14 @@ LoadModulePath=/usr/lib/zabbix
 # TLSCRLFile=
 
 ### Option: TLSServerCertIssuer
-#      Allowed server certificate issuer.
+#	Allowed server certificate issuer.
 #
 # Mandatory: no
 # Default:
 # TLSServerCertIssuer=
 
 ### Option: TLSServerCertSubject
-#      Allowed server certificate subject.
+#	Allowed server certificate subject.
 #
 # Mandatory: no
 # Default:
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index d4d5a22fba..8aac4d0004 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.1
+VER        = 4.2.6
 
 THISAPP    = zabbix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = zabbix_agentd
-PAK_VER    = 3
+PAK_VER    = 4
 DEPS       = ""
 
 ###############################################################################
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e55ba94060ba2548ae8a1c29fd7cb7dd
+$(DL_FILE)_MD5 = 6cd55cd743d416d9ffbf2e6fdee680ee
 
 install : $(TARGET)