From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Koch <ipfire@starkstromkonsument.de>
To: development@lists.ipfire.org
Subject: [PATCH] zabbix_agentd: Update to 4.2.6
Date: Sun, 01 Sep 2019 23:34:58 +0200
Message-ID: <20190901213458.22220-1-ipfire@starkstromkonsument.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3070898576026442652=="
List-Id: <development.lists.ipfire.org>

--===============3070898576026442652==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
---
 config/zabbix_agentd/zabbix_agentd.conf | 12 ++++++++----
 lfs/zabbix_agentd                       |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/zabbix_agentd/zabbix_agentd.conf b/config/zabbix_agentd/z=
abbix_agentd.conf
index 07f71c184..21b8e0122 100644
--- a/config/zabbix_agentd/zabbix_agentd.conf
+++ b/config/zabbix_agentd/zabbix_agentd.conf
@@ -305,8 +305,12 @@ LoadModulePath=3D/usr/lib/zabbix
=20
 ### Option: LoadModule
 #	Module to load at agent startup. Modules are used to extend functionality =
of the agent.
-#	Format: LoadModule=3D<module.so>
-#	The modules must be located in directory specified by LoadModulePath.
+#	Formats:
+#		LoadModule=3D<module.so>
+#		LoadModule=3D<path/module.so>
+#		LoadModule=3D</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=3D/usr/lib/zabbix
 # TLSCRLFile=3D
=20
 ### Option: TLSServerCertIssuer
-#      Allowed server certificate issuer.
+#	Allowed server certificate issuer.
 #
 # Mandatory: no
 # Default:
 # TLSServerCertIssuer=3D
=20
 ### Option: TLSServerCertSubject
-#      Allowed server certificate subject.
+#	Allowed server certificate subject.
 #
 # Mandatory: no
 # Default:
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index d4d5a22fb..8aac4d000 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 4.2.1
+VER        =3D 4.2.6
=20
 THISAPP    =3D zabbix-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D zabbix_agentd
-PAK_VER    =3D 3
+PAK_VER    =3D 4
 DEPS       =3D ""
=20
 ############################################################################=
###
@@ -43,7 +43,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D e55ba94060ba2548ae8a1c29fd7cb7dd
+$(DL_FILE)_MD5 =3D 6cd55cd743d416d9ffbf2e6fdee680ee
=20
 install : $(TARGET)
=20
--=20
2.17.1


--===============3070898576026442652==--