diff mbox series

[bug#78534] Update zabbix to 7.2.7

Message ID 87plg2f6xg.fsf@lapenas.dev
State New
Headers
Series [bug#78534] Update zabbix to 7.2.7 |

Commit Message

Ignas Lapėnas May 21, 2025, 1:07 p.m. UTC 
  * 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 mbox series

Patch

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