From patchwork Fri May 9 07:01:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ignas_Lap=C4=97nas?= X-Patchwork-Id: 42476 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 20C8427BC4A; Fri, 9 May 2025 08:02:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B622927BC49 for ; Fri, 9 May 2025 08:02:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDHkF-0001Nh-35; Fri, 09 May 2025 03:02:07 -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 1uDHkB-0001Fc-NU for guix-patches@gnu.org; Fri, 09 May 2025 03:02:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDHkA-0001L0-Qq for guix-patches@gnu.org; Fri, 09 May 2025 03:02:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=sqvhGvsmMrYmLFtskqMHRDIvIx2okZOaRwgiFrwl9Is=; b=OMe1oMgDNZrc4tkq2v8szvr65xN9kAw4do3SQjbGsiJLmuu2Kg7+eIpYRodCywW3UEU1m2VANMzkUIrnmSEeFmD95JIcyn60bCad05r+VcUU4vkmYV4kkhSntLJw7O7wjRTR72vU7nFiexC+bZ4Sbmjb9wexVIITXbys3sW/lEmOPM7DeuKw9Zhr0bYVoyhnT0XrTRQWcF1FqgZ8UlZvNN2FJlaYK5VAx5IVfByqTYO7FcS2UfzZcxlu0EuuYtowzWZiaamzh0lhDG3Ah2PA/W+0oiDxtoZGYnd8eILwArhvQ/3u6CLcNELt+7a8dZYAO8+eLfYpjTEcsv5ZHOy3Ew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDHkA-0000I1-HN for guix-patches@gnu.org; Fri, 09 May 2025 03:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78314] [PATCH] Update zabbix package to 7.2.6 References: <87ldr7nz7n.fsf@lapenas.dev> In-Reply-To: <87ldr7nz7n.fsf@lapenas.dev> Resent-From: Ignas =?utf-8?q?Lap=C4=97nas?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 07:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78314@debbugs.gnu.org Received: via spool by 78314-submit@debbugs.gnu.org id=B78314.17467741051079 (code B ref 78314); Fri, 09 May 2025 07:02:02 +0000 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: Ignas =?utf-8?q?Lap=C4=97nas?= 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 X-Sender: ignas@lapenas.dev X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 21:36:30 2022, Thu Nov 10 18:33:47 2022 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