summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorIgnas Lapėnas <ignas@lapenas.dev>2025-06-26 11:57:10 +0300
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-07-07 10:08:00 +0100
commit94a8daf9acfb4ac9a08568e83353ee26006701d2 (patch)
tree4f807673c89c8e80e3bf8a5f63fb6e692eb2f858 /gnu
parent98a3f273accd27ba25016fde8d06a51a0a70566e (diff)
gnu: zabbix-agentd: Update to 7.2.9.
Zabbix has changed the license to AGPLv3 starting from v7.0, see: <https://www.zabbix.com/license>. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 7.2.9. [license]: Correct it. (zabbix-agent2) [patches]: Add zabbix-agent2-test-timezone-fix.patch fixing timezone to UTC for datetimes test. [native-inputs]: Remove go; add go-1.23. * gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch: Add file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: Ia95e4debf340724a3fba4850380231b0da3fafd2
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/monitoring.scm12
-rw-r--r--gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch17
3 files changed, 26 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index d98abb513b5..1b72ab56092 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2468,6 +2468,7 @@ dist_patch_DATA = \
2468 %D%/packages/patches/xygrib-newer-proj.patch \ 2468 %D%/packages/patches/xygrib-newer-proj.patch \
2469 %D%/packages/patches/yajl-CVE-2023-33460.patch \ 2469 %D%/packages/patches/yajl-CVE-2023-33460.patch \
2470 %D%/packages/patches/yggdrasil-extra-config.patch \ 2470 %D%/packages/patches/yggdrasil-extra-config.patch \
2471 %D%/packages/patches/zabbix-agent2-test-timezone-fix.patch \
2471 %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch \ 2472 %D%/packages/patches/zig-0.9-build-respect-PKG_CONFIG-env-var.patch \
2472 %D%/packages/patches/zig-0.9-fix-runpath.patch \ 2473 %D%/packages/patches/zig-0.9-fix-runpath.patch \
2473 %D%/packages/patches/zig-0.9-riscv-support.patch \ 2474 %D%/packages/patches/zig-0.9-riscv-support.patch \
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 6987d701c82..66b1a761d9c 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -179,7 +179,7 @@ etc. via a Web interface. Features include:
179(define-public zabbix-agentd 179(define-public zabbix-agentd
180 (package 180 (package
181 (name "zabbix-agentd") 181 (name "zabbix-agentd")
182 (version "6.0.14") 182 (version "7.2.9")
183 (source 183 (source
184 (origin 184 (origin
185 (method url-fetch) 185 (method url-fetch)
@@ -187,7 +187,7 @@ etc. via a Web interface. Features include:
187 "https://cdn.zabbix.com/zabbix/sources/stable/" 187 "https://cdn.zabbix.com/zabbix/sources/stable/"
188 (version-major+minor version) "/zabbix-" version ".tar.gz")) 188 (version-major+minor version) "/zabbix-" version ".tar.gz"))
189 (sha256 189 (sha256
190 (base32 "0n6fqa9vbhh2syxii7ds2x6dnplrgrj98by1zl0ij1wfbnbxa6k3")) 190 (base32 "1rq03lpkz5d04540xiywlzwjva7v0v6isgny8ajslbadv99f6g5a"))
191 (modules '((guix build utils))) 191 (modules '((guix build utils)))
192 (snippet 192 (snippet
193 '(substitute* '("src/zabbix_proxy/proxy.c" 193 '(substitute* '("src/zabbix_proxy/proxy.c"
@@ -212,7 +212,7 @@ etc. via a Web interface. Features include:
212 (synopsis "Distributed monitoring solution (client-side agent)") 212 (synopsis "Distributed monitoring solution (client-side agent)")
213 (description "This package provides a distributed monitoring 213 (description "This package provides a distributed monitoring
214solution (client-side agent)") 214solution (client-side agent)")
215 (license license:gpl2+) 215 (license license:agpl3)
216 (properties 216 (properties
217 '((release-monitoring-url . "https://www.zabbix.com/download_sources") 217 '((release-monitoring-url . "https://www.zabbix.com/download_sources")
218 (upstream-name . "zabbix"))))) 218 (upstream-name . "zabbix")))))
@@ -220,6 +220,10 @@ solution (client-side agent)")
220(define-public zabbix-agent2 220(define-public zabbix-agent2
221 (package/inherit zabbix-agentd 221 (package/inherit zabbix-agentd
222 (name "zabbix-agent2") 222 (name "zabbix-agent2")
223 (source
224 (origin
225 (inherit (package-source zabbix-agentd))
226 (patches (search-patches "zabbix-agent2-test-timezone-fix.patch"))))
223 (arguments 227 (arguments
224 (list #:configure-flags 228 (list #:configure-flags
225 #~(list "--disable-agent" 229 #~(list "--disable-agent"
@@ -239,7 +243,7 @@ solution (client-side agent)")
239 (lambda _ 243 (lambda _
240 (setenv "HOME" "/tmp")))))) 244 (setenv "HOME" "/tmp"))))))
241 (native-inputs 245 (native-inputs
242 (list go pkg-config)) 246 (list go-1.23 pkg-config))
243 (inputs 247 (inputs
244 (list openssl pcre2 zlib)))) 248 (list openssl pcre2 zlib))))
245 249
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 00000000000..3641917e02e
--- /dev/null
+++ b/gnu/packages/patches/zabbix-agent2-test-timezone-fix.patch
@@ -0,0 +1,17 @@
1The test expects datetimes to match EEST timezone. Guix gnu-build-system
2defaults to UTC. This patch addresses it.
3
4@@ -0,0 +1,0 @@
5Diff --git a/src/go/plugins/system/sw/sw_test.go b/src/go/plugins/system/sw/sw_test.go
6index 680e61f0ca7..864862da791 100644
7--- a/src/go/plugins/system/sw/sw_test.go
8+++ b/src/go/plugins/system/sw/sw_test.go
9@@ -32,6 +32,6 @@ install ok installed,dos2unix,7.4.1-1,amd64,1321`,
10 "input": `glibc-gconv-extra,2.34-48.el9,x86_64,8122308,1666100063,1669204555
11 elfutils-default-yama-scope,0.187-5.el9,noarch,1810,1655411412,1659990239
12 perl-Scalar-List-Utils,1.56-461.el9,x86_64,143652,1628565132,1662121942`,
13- "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"}}]`,
14+ "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"}}]`,
15 },
16 "pacman": {
17 "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