[packages/zabbix] upstream fix for error in graphs
atler
atler at pld-linux.org
Fri Oct 31 01:23:09 CET 2025
commit 40fd39efad95c66a7995b26be895d7f1db059f39
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Oct 30 20:28:06 2025 +0100
upstream fix for error in graphs
see https://support.zabbix.com/browse/ZBX-27153
manual patch (bitbucket is so brain-dead it has no possibility to export
patch or even bare unified diff) based on:
https://git.zabbix.com/projects/ZBX/repos/zabbix/commits/a5fb72082e6f6fdbe3b0a6fb11d744e2190e69c9
https://git.zabbix.com/projects/ZBX/repos/zabbix/commits/c9eccb47398b54fc3cc84a04034984a43b653dcf
ZBX-27153.patch | 20 ++++++++++++++++++++
zabbix.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/zabbix.spec b/zabbix.spec
index 1e40e11..f847581 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -52,6 +52,7 @@ Patch1: sqlite3_dbname.patch
Patch2: always_compile_ipc.patch
Patch3: go-vendor.patch
Patch4: builddir.patch
+Patch5: ZBX-27153.patch
URL: https://www.zabbix.com/
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
@@ -370,6 +371,7 @@ This package provides the Zabbix Java Gateway.
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
+%patch -P5 -p1
%build
%{__libtoolize}
diff --git a/ZBX-27153.patch b/ZBX-27153.patch
new file mode 100644
index 0000000..480cf68
--- /dev/null
+++ b/ZBX-27153.patch
@@ -0,0 +1,20 @@
+--- zabbix-7.0.20/ui/widgets/svggraph/includes/CSvgGraphHelper.php.orig 2025-10-28 08:32:37.785793008 +0100
++++ zabbix-7.0.20/ui/widgets/svggraph/includes/CSvgGraphHelper.php 2025-10-30 20:24:57.907138212 +0100
+@@ -154,7 +154,7 @@
+ $resolve_macros = $templateid === '' || $override_hostid !== '';
+
+ $options = [
+- 'output' => ['itemid', 'hostid', 'type', 'master_itemid', 'delay', 'history', 'trends', 'units',
++ 'output' => ['itemid', 'hostid', 'type', 'key_', 'master_itemid', 'delay', 'history', 'trends', 'units',
+ 'value_type'
+ ],
+ 'selectPreprocessing' => ['type', 'params'],
+@@ -299,7 +299,7 @@
+ $resolve_macros = $templateid === '' || $override_hostid !== '';
+
+ $db_items = API::Item()->get([
+- 'output' => ['itemid', 'hostid', 'type', 'master_itemid', 'delay',
++ 'output' => ['itemid', 'hostid', 'type', 'key_', 'master_itemid', 'delay',
+ $resolve_macros ? 'name_resolved' : 'name', 'history', 'trends', 'units', 'value_type'
+ ],
+ 'selectPreprocessing' => ['type', 'params'],
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zabbix.git/commitdiff/461e1e1a416e19603ecda3eb2ad25f98228cbab5
More information about the pld-cvs-commit
mailing list