diff mbox series

[bug#78314] Update zabbix package to 7.2.6

Message ID 878qn66ze4.fsf@lapenas.dev
State New
Headers
Series [bug#78314] Update zabbix package to 7.2.6 |

Commit Message

Ignas Lapėnas May 9, 2025, 7:01 a.m. UTC 
  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 mbox series

Patch

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