From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4g7G5h5C4Fz2yph for ; Sat, 02 May 2026 18:04:56 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4g7G5d3Kjwz2xQT for ; Sat, 02 May 2026 18:04:53 +0000 (UTC) Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4g7G5c1hkzz44j for ; Sat, 02 May 2026 18:04:52 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=egH4D+OD; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1777745092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=rQ6YeJYmLosd7W73q3kFtdGTe739klodHCaGHKN/xhU=; b=byeYfGPERZFc56a/NXiqQDcWgZTIXmDsw2NgN7eT2DASMC5pwcoyJuOv6c6wyml/ijLMZX Om7qsoNYwZRHukwb6Q6jEZHtX3TEnDLV8btpgtbcJspRKPH7efWIvIIVl68y6Fb+4EaQ3Z 1uVlzjG0CIuxSbHPyI99OEnZPo+w031mE/W1Lg3gOZikwP+TKcGiV/73q63MLWsC4f538X NDzFQC27TYaIuoOBtMW/EIutSn+vKRRKNkbsaFyCYuDX0g600FLtVjsXEDg5nj78qjXMAV /TR6Fci47qagWLIxjQ5mv/vSz7YOGT0oahRkaOlLNvbr+ACKG6LqEnvLy8MgvQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=egH4D+OD; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org ARC-Seal: i=1; a=rsa-sha256; d=lists.ipfire.org; s=202003rsa; cv=none; t=1777745092; b=T5SvVSaiF0Bqi+YqUFEd7EjWJmFeNIPjE0UGA6SS/G25YZVGTpOkUn0ZhZNxYw+XztB7qA CjmMIHCunStLXQ7yNe2DYVJxDVYGFcZRzF6VyAMMjpe1YkSWE0Hh5tbp8NEbNWlJjQN+tS JwfhIjKpVE9MZukjSnJlHWx/d1Sa/qcdlokP07weKfsiS+CWLSzX6DAv5mV4tFIm1of1PL lSy1CKKPsf9shqSga0QlrOTIz/WTgm6ZDTUnKpjv4+bFyt/XTLEz+kzl9pCZmvGOieaaLa YD3+aRQDsmkUVfKnaIjkDhrwfiDBWElDJmVVSRqPTjdViR56ObZmmyKx/WpfUw== Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A7E01271FB; Sat, 2 May 2026 20:04:51 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id bfqjbMD07AxW; Sat, 2 May 2026 20:04:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1777745090; bh=bgMNZ/qzRe3FJH2+VSEuVgo3VyRloXhmRS+zvdVmQlc=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=egH4D+ODbhqXMyiDDooa+5LvwB7SEmw3iKoWOeKyzwZNHxTahTDKMKBRdl1Q3ATT4 LWGPHMq8ztWvuIohhJMUbXaTnhfXmp4U+7kLiOqwnc7Mrqlouf9s/znAjAhurxVqR7 paIgMkQ82bRH1mmpsZNeDREHafguG9BuHwlQofA3qSkzmgg57bJAt9/ekuILPLLGX+ B3uvquULK+ivKNRrRG7mfN7NxsDukYqUXGyfl7kwzPuuElFm2pnhAiG/VEFWM2DI6g hRUr9DgTR8FT90hMBCBvFEo4fMeUbjbiZspfj4JPD7CV9HOZRMMXIDXtChAWamxd18 3F8oejjgR71WQ== Received: from chojin.roevenslambrechts.be (chojin.roevenslambrechts.be [192.168.0.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id CF927514735; Sat, 2 May 2026 20:04:41 +0200 (CEST) Message-ID: <8dafc952f74deaceeac2225c42f83159696bafc1.camel@disroot.org> Subject: Re: [PATCH 1/2] zabbix_agentd: Update to 7.0.24 (LTS) From: Robin Roevens To: Michael Tremer Cc: development@lists.ipfire.org Date: Sat, 02 May 2026 20:04:41 +0200 In-Reply-To: <20260325192808.3847263-2-robin.roevens@disroot.org> References: <20260325192808.3847263-1-robin.roevens@disroot.org> <20260325192808.3847263-2-robin.roevens@disroot.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.60.1 Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 X-RoevensLambrechts-MailScanner-ID: CF927514735.A96E4 X-RoevensLambrechts-MailScanner: Found to be clean X-RoevensLambrechts-MailScanner-From: robin.roevens@disroot.org X-RoevensLambrechts-MailScanner-Watermark: 1778349885.45333@DXJzKfp2xx0lW/IQgSGuAQ X-Rspamd-Action: no action X-Spamd-Result: default: False [-5.02 / 11.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,reject]; R_SPF_ALLOW(-0.20)[+a]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; TO_DN_SOME(0.00)[]; DKIM_REPUTATION(0.00)[0]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+] X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4g7G5c1hkzz44j 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.=20 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 >=20 > 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 >=20 > 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 >=20 > Signed-off-by: Robin Roevens > --- > =C2=A0lfs/zabbix_agentd | 6 +++--- > =C2=A01 file changed, 3 insertions(+), 3 deletions(-) >=20 > 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 > =C2=A0 > =C2=A0SUMMARY=C2=A0=C2=A0=C2=A0 =3D Zabbix Agent > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 7.0.21 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 7.0.24 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0 =3D zabbix-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.gz > @@ -34,7 +34,7 @@ DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP) > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D zabbix_agentd > -PAK_VER=C2=A0=C2=A0=C2=A0 =3D 20 > +PAK_VER=C2=A0=C2=A0=C2=A0 =3D 21 > =C2=A0 > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D fping > =C2=A0 > @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_BLAKE2 =3D > afc14329a5e97db6aca7f6dbd27921d8e6c1812f0c64e1e811bf41dd3fffe88cd0fac > d8afa56f06061aea74476f429b81ac55cbe5d6e325925dc0f0f45c354d9 > +$(DL_FILE)_BLAKE2 =3D > d508b84185493ce830ff2990569407c4e6ff03437c406e15258c1641e21c4c3b5195c > a329903c44b73ec4fec022bd31c6bdd3883caa824e577e5044c0a5e840a > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > --=20 > 2.53.0 >=20 --=20 Dit bericht is gescanned op virussen en andere gevaarlijke inhoud door MailScanner en lijkt schoon te zijn.