From unknown Tue Jun 17 20:18:36 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#78314 <78314@debbugs.gnu.org> To: bug#78314 <78314@debbugs.gnu.org> Subject: Status: [PATCH] Update zabbix package to 7.2.6 Reply-To: bug#78314 <78314@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:18:36 +0000 retitle 78314 [PATCH] Update zabbix package to 7.2.6 reassign 78314 guix-patches submitter 78314 Ignas Lap=C4=97nas severity 78314 normal tag 78314 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu May 08 07:01:31 2025 Received: (at submit) by debbugs.gnu.org; 8 May 2025 11:01:31 +0000 Received: from localhost ([127.0.0.1]:54727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCz0N-0000Dy-7W for submit@debbugs.gnu.org; Thu, 08 May 2025 07:01:31 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40576) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCz0K-0000DZ-Uk for submit@debbugs.gnu.org; Thu, 08 May 2025 07:01:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCz0F-0005m1-5q for guix-patches@gnu.org; Thu, 08 May 2025 07:01:23 -0400 Received: from tritonas.serveriai.lt ([194.135.87.87]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCz0C-00016d-IC for guix-patches@gnu.org; Thu, 08 May 2025 07:01:22 -0400 Received: from [88.119.78.42] (helo=thorfin) by tritonas.serveriai.lt with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1uCz08-000000005LJ-3Eal for guix-patches@gnu.org; Thu, 08 May 2025 14:01:16 +0300 From: =?utf-8?Q?Ignas_Lap=C4=97nas?= To: guix-patches@gnu.org Subject: [PATCH] Update zabbix package to 7.2.6 User-Agent: mu4e 1.12.9; emacs 29.4 Date: Thu, 08 May 2025 14:01:16 +0300 Message-ID: <87ldr7nz7n.fsf@lapenas.dev> MIME-Version: 1.0 Content-Type: text/plain X-Sender: ignas@lapenas.dev Received-SPF: pass client-ip=194.135.87.87; envelope-from=ignas@lapenas.dev; helo=tritonas.serveriai.lt X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) License changed from version 7.0 to AGPLv3 More info: https://www.zabbix.com/license Change-Id: I8ee61fc84d430c33e3afab6c6974065ba1bd9222 --- gnu/packages/monitoring.scm | 64 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 1009c32783..68c1ad8225 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -177,7 +177,7 @@ (define-public nagios (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "6.0.14") + (version "7.2.6") (source (origin (method url-fetch) @@ -185,7 +185,7 @@ (define-public zabbix-agentd "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) + (base32 "0hch7dbgwis3yng8mz6axczpr1v3d5l8hpwlxjrw26yw17crq2g8")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" @@ -210,7 +210,7 @@ (define-public zabbix-agentd (synopsis "Distributed monitoring solution (client-side agent)") (description "This package provides a distributed monitoring solution (client-side agent)") - (license license:gpl2+) + (license license:agpl3) (properties '((release-monitoring-url . "https://www.zabbix.com/download_sources") (upstream-name . "zabbix"))))) base-commit: 0ae79a787f81e680e3983813c684a7d82dc213f3 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 09 03:01:45 2025 Received: (at 78314) by debbugs.gnu.org; 9 May 2025 07:01:45 +0000 Received: from localhost ([127.0.0.1]:34858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDHjs-0000HJ-OQ for submit@debbugs.gnu.org; Fri, 09 May 2025 03:01:45 -0400 Received: from tritonas.serveriai.lt ([194.135.87.87]:44517) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDHjq-0000H7-7I for 78314@debbugs.gnu.org; Fri, 09 May 2025 03:01:43 -0400 Received: from [88.119.78.42] (helo=thorfin) by tritonas.serveriai.lt with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1uDHjn-000000006Tx-2xPZ for 78314@debbugs.gnu.org; Fri, 09 May 2025 10:01:39 +0300 From: =?utf-8?Q?Ignas_Lap=C4=97nas?= To: 78314@debbugs.gnu.org Subject: [PATCH] Update zabbix package to 7.2.6 User-Agent: mu4e 1.12.9; emacs 29.4 Date: Fri, 09 May 2025 10:01:39 +0300 Message-ID: <878qn66ze4.fsf@lapenas.dev> MIME-Version: 1.0 Content-Type: text/plain X-Sender: ignas@lapenas.dev X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78314 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Saw the failing QA and looked into it a bit more It seems that zabbix-agent2 has a test that expects the timezone to be Europe/Riga One way would be to set the ENV variable TZ=Europe/Riga, but somehow I doubt that would be the right decision here. Lower is a diff to change the hardcoded failing test timestamps to be inline with UTC diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 68c1ad8225..fff202bd9d 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -186,6 +186,7 @@ (define-public zabbix-agentd (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 (base32 "0hch7dbgwis3yng8mz6axczpr1v3d5l8hpwlxjrw26yw17crq2g8")) + (patches (search-patches "zabbix-sw-test-fix-timezone.patch")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" diff --git a/gnu/packages/patches/zabbix-sw-test-fix-timezone.patch b/gnu/packages/patches/zabbix-sw-test-fix-timezone.patch new file mode 100644 index 0000000000..8e498c1d0a --- /dev/null +++ b/gnu/packages/patches/zabbix-sw-test-fix-timezone.patch @@ -0,0 +1,13 @@ +diff --git a/src/go/plugins/system/sw/sw_test.go b/src/go/plugins/system/sw/sw_test.go +index 680e61f0ca7..864862da791 100644 +--- a/src/go/plugins/system/sw/sw_test.go ++++ b/src/go/plugins/system/sw/sw_test.go +@@ -32,7 +32,7 @@ install ok installed,dos2unix,7.4.1-1,amd64,1321`, + "input": `glibc-gconv-extra,2.34-48.el9,x86_64,8122308,1666100063,1669204555 + elfutils-default-yama-scope,0.187-5.el9,noarch,1810,1655411412,1659990239 + perl-Scalar-List-Utils,1.56-461.el9,x86_64,143652,1628565132,1662121942`, +- "expectedOutput": `[{"name":"glibc-gconv-extra","manager":"rpm","version":"2.34-48.el9","size":8122308,"arch":"x86_64","buildtime":{"timestamp":1666100063,"value":"Tue Oct 18 16:34:23 2022"},"installtime":{"timestamp":1669204555,"value":"Wed Nov 23 13:55:55 2022"}},{"name":"elfutils-default-yama-scope","manager":"rpm","version":"0.187-5.el9","size":1810,"arch":"noarch","buildtime":{"timestamp":1655411412,"value":"Thu Jun 16 23:30:12 2022"},"installtime":{"timestamp":1659990239,"value":"Mon Aug 8 23:23:59 2022"}},{"name":"perl-Scalar-List-Utils","manager":"rpm","version":"1.56-461.el9","size":143652,"arch":"x86_64","buildtime":{"timestamp":1628565132,"value":"Tue Aug 10 06:12:12 2021"},"installtime":{"timestamp":1662121942,"value":"Fri Sep 2 15:32:22 2022"}}]`, ++ "expectedOutput": `[{"name":"glibc-gconv-extra","manager":"rpm","version":"2.34-48.el9","size":8122308,"arch":"x86_64","buildtime":{"timestamp":1666100063,"value":"Tue Oct 18 13:34:23 2022"},"installtime":{"timestamp":1669204555,"value":"Wed Nov 23 11:55:55 2022"}},{"name":"elfutils-default-yama-scope","manager":"rpm","version":"0.187-5.el9","size":1810,"arch":"noarch","buildtime":{"timestamp":1655411412,"value":"Thu Jun 16 20:30:12 2022"},"installtime":{"timestamp":1659990239,"value":"Mon Aug 8 20:23:59 2022"}},{"name":"perl-Scalar-List-Utils","manager":"rpm","version":"1.56-461.el9","size":143652,"arch":"x86_64","buildtime":{"timestamp":1628565132,"value":"Tue Aug 10 03:12:12 2021"},"installtime":{"timestamp":1662121942,"value":"Fri Sep 2 12:32:22 2022"}}]`, + }, + "pacman": { + "input": ` wget, 1.21.3-1, x86_64, 3.03 MiB, Sun Mar 20 21:36:30 2022, Thu Nov 10 18:33:47 2022 From debbugs-submit-bounces@debbugs.gnu.org Wed May 21 09:16:53 2025 Received: (at 78314) by debbugs.gnu.org; 21 May 2025 13:16:53 +0000 Received: from localhost ([127.0.0.1]:47353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHjJU-0001ur-Sf for submit@debbugs.gnu.org; Wed, 21 May 2025 09:16:53 -0400 Received: from tritonas.serveriai.lt ([194.135.87.87]:38069) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHjJS-0001ue-2A for 78314@debbugs.gnu.org; Wed, 21 May 2025 09:16:51 -0400 Received: from [88.119.78.42] (helo=thorfin) by tritonas.serveriai.lt with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1uHjJP-000000006LA-46Vk for 78314@debbugs.gnu.org; Wed, 21 May 2025 16:16:47 +0300 From: =?utf-8?Q?Ignas_Lap=C4=97nas?= To: 78314@debbugs.gnu.org Subject: [PATCH] Update zabbix package to 7.2.6 User-Agent: mu4e 1.12.9; emacs 29.4 Date: Wed, 21 May 2025 16:16:47 +0300 Message-ID: <87jz6af6io.fsf@lapenas.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Sender: ignas@lapenas.dev X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78314 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This can be closed. Sent a new patch for 7.2.7 version. https://issues.guix.gnu.org/78534 --=20 Best Regards, Ignas Lap=C4=97nas