From patchwork Wed May 21 13:07:55 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: 42830 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 43F0E27BC49; Wed, 21 May 2025 14:09: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 4688827BC4A for ; Wed, 21 May 2025 14:09:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHjBw-0003XH-Oi; Wed, 21 May 2025 09:09:04 -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 1uHjBu-0003X5-Vn for guix-patches@gnu.org; Wed, 21 May 2025 09:09:03 -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 1uHjBu-0007tt-HU for guix-patches@gnu.org; Wed, 21 May 2025 09:09:02 -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:Subject; bh=4oFRgSqj8EslhYi3XMivPurJqw8fZ+NqPlj95HaURnE=; b=Uf5tPxkZK0OZL4Qz8oxW05DGwi5B6jYjisjS7i+A70sAVtJJg5Rj/H+OfxnMiAjE/lL7ZQHxDh8sHDDAhEz5199pAeUkzj1xo60fqIwXNPF9skpsD2xf/ACj4coYSP4JZc1UpMg4lyCj32z1K9/yoq4ijuSQsttpiv/awnl82jLQ1l3fsSbfL/RD4KH804SGKMihfMcImsYYm6F8ZFWiACRDPLds+yqhYaYqSaSbS6j9MpcYjR+PUOQhxMeJ6EykvfRL59zFyMqacv85hAXV3oAU3A5BjUeE0xBRwUfIbNyDaLhyOhzBExnwyJfTNSLNvYRmx2RzEVVPcf6xjlD1bQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHjBu-0001AS-0q for guix-patches@gnu.org; Wed, 21 May 2025 09:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78534] [PATCH] Update zabbix to 7.2.7 Resent-From: Ignas =?utf-8?q?Lap=C4=97nas?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 May 2025 13:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78534 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78534@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17478329134373 (code B ref -1); Wed, 21 May 2025 13:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2025 13:08:33 +0000 Received: from localhost ([127.0.0.1]:47241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHjBQ-00018S-US for submit@debbugs.gnu.org; Wed, 21 May 2025 09:08:33 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52726) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHjBN-00016b-41 for submit@debbugs.gnu.org; Wed, 21 May 2025 09:08:30 -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 1uHjB2-0003TO-Dw for guix-patches@gnu.org; Wed, 21 May 2025 09:08:09 -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 1uHjAv-0007iE-Ay for guix-patches@gnu.org; Wed, 21 May 2025 09:08:07 -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 1uHjAp-000000003rX-2dRR for guix-patches@gnu.org; Wed, 21 May 2025 16:07:55 +0300 From: Ignas =?utf-8?q?Lap=C4=97nas?= User-Agent: mu4e 1.12.9; emacs 29.4 Date: Wed, 21 May 2025 16:07:55 +0300 Message-ID: <87plg2f6xg.fsf@lapenas.dev> MIME-Version: 1.0 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/monitoring.scm (zabbix-agentd): Update to 7.2.7. Change license to AGPL-3 * gnu/packages/patches/zabbix-fix-test-timezone.patch: Add file Change-Id: I7c07b310ce1ac7d85d4fa50b25d549d4c5b11cc2 --- gnu/packages/monitoring.scm | 6 +++--- gnu/packages/patches/zabbix-fix-test-timezone.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/zabbix-fix-test-timezone.patch base-commit: 11bc17c409d77cd1af91e30b5b9f6a73f873a152 diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 1009c32783..f495196d46 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.7") (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 "0vx51xy06a8mb4zwlq3vx6ywawm0jd2gw1q23ks2kh0140f7qgrj")) (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"))))) diff --git a/gnu/packages/patches/zabbix-fix-test-timezone.patch b/gnu/packages/patches/zabbix-fix-test-timezone.patch new file mode 100644 index 0000000000..8e498c1d0a --- /dev/null +++ b/gnu/packages/patches/zabbix-fix-test-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