diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/monitoring.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch | 17 |
3 files changed, 26 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d98abb513b..1b72ab5609 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2468,6 +2468,7 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yajl-CVE-2023-33460.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ + %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch \ %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch \ %D%/packages/patches/zig-0.9-fix-runpath.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 6987d701c8..66b1a761d9 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -179,7 +179,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "6.0.14") + (version "7.2.9") (source (origin (method url-fetch) @@ -187,7 +187,7 @@ etc. via a Web interface. Features include: "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) + (base32 "1rq03lpkz5d04540xiywlzwjva7v0v6isgny8ajslbadv99f6g5a")) (modules '((guix build utils))) (snippet '(substitute* '("src/zabbix_proxy/proxy.c" @@ -212,7 +212,7 @@ etc. via a Web interface. Features include: (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"))))) @@ -220,6 +220,10 @@ solution (client-side agent)") (define-public zabbix-agent2 (package/inherit zabbix-agentd (name "zabbix-agent2") + (source + (origin + (inherit (package-source zabbix-agentd)) + (patches (search-patches "zabbix-agent2-test-timezone-fix.patch")))) (arguments (list #:configure-flags #~(list "--disable-agent" @@ -239,7 +243,7 @@ solution (client-side agent)") (lambda _ (setenv "HOME" "/tmp")))))) (native-inputs - (list go pkg-config)) + (list go-1.23 pkg-config)) (inputs (list openssl pcre2 zlib)))) diff --git a/gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch b/gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch new file mode 100644 index 0000000000..3641917e02 --- /dev/null +++ b/gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch @@ -0,0 +1,17 @@ +The test expects datetimes to match EEST timezone. Guix gnu-build-system +defaults to UTC. This patch addresses it. + +@@ -0,0 +1,0 @@ +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,6 +32,6 @@ 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
\ No newline at end of file |