Re: [PATCH 1/2] zabbix_agentd: Update to 7.0.24 (LTS)

[Robin Roevens <robin.roevens@disroot.org>]

Hi Michael

I think you overwrote my changes:
- 90c45aad85615bbd376dfb81a4986a36897fe402
- dcccd2d80fd951b7b96f5232a5f3bda5bb7a0664

to the Zabbix_agentd in your commit:
03b47a48a0bd707eabc982fc3c68a9fda3ee75ea

I'm not sure what you did there, as you first applied your changes to
next, effectively merging them with my changes. But you also made those
changes in the master branch that did not yet have my updates. 
And then finally you merged the master branch onto next, overwriting my
changes.

So in CU 201 Zabbix agent 7.0.21 is still shipped and DBUS and LLDP is
still not monitored :-)

Can you fix this ?

Thanks
Robin


Robin Roevens schreef op wo 25-03-2026 om 20:26 [+0100]:
> - Update of rootfile not required
> 
> Bugs fixed:
> - ZBX-26111	Fixed JSON output for vfs.dev.discovery DEVTYPE
> field
> - ZBX-26500	Fixed system.users.num metric incorrect returned
> value
> - ZBX-26383	Fixed inability to return "not supported" via user
> parameters
> 
> Full changelogs:
> - https://www.zabbix.com/rn/rn7.0.22
> - https://www.zabbix.com/rn/rn7.0.23
> - https://www.zabbix.com/rn/rn7.0.24
> 
> Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
> ---
>  lfs/zabbix_agentd | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
> index be61ca02e..124f60ac0 100644
> --- a/lfs/zabbix_agentd
> +++ b/lfs/zabbix_agentd
> @@ -26,7 +26,7 @@ include Config
>  
>  SUMMARY    = Zabbix Agent
>  
> -VER        = 7.0.21
> +VER        = 7.0.24
>  
>  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    = 20
> +PAK_VER    = 21
>  
>  DEPS       = fping
>  
> @@ -48,7 +48,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_BLAKE2 =
> afc14329a5e97db6aca7f6dbd27921d8e6c1812f0c64e1e811bf41dd3fffe88cd0fac
> d8afa56f06061aea74476f429b81ac55cbe5d6e325925dc0f0f45c354d9
> +$(DL_FILE)_BLAKE2 =
> d508b84185493ce830ff2990569407c4e6ff03437c406e15258c1641e21c4c3b5195c
> a329903c44b73ec4fec022bd31c6bdd3883caa824e577e5044c0a5e840a
>  
>  install : $(TARGET)
>  
> -- 
> 2.53.0
> 

-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.