[zabbix20/el5] Add patch for ZBX-6318
Volker Fröhlich
volter at fedoraproject.org
Tue Mar 19 13:11:01 UTC 2013
commit 95f44cc505c14d765677f8e650bc4fa9911df10b
Author: Volker Fröhlich <volker27 at gmx.at>
Date: Tue Mar 19 14:10:43 2013 +0100
Add patch for ZBX-6318
zabbix-2.0.5-zbx6318.patch | 13 +++++++++++++
zabbix20.spec | 10 +++++++++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/zabbix-2.0.5-zbx6318.patch b/zabbix-2.0.5-zbx6318.patch
new file mode 100644
index 0000000..fc04ea4
--- /dev/null
+++ b/zabbix-2.0.5-zbx6318.patch
@@ -0,0 +1,13 @@
+Index: frontends/php/include/db.inc.php
+===================================================================
+--- frontends/php/include/db.inc.php (revision 34427)
++++ frontends/php/include/db.inc.php (working copy)
+@@ -1087,7 +1087,7 @@
+ while (false !== ($valueR = next($values))) {
+ $valueL = bcadd($valueL, 1, 0);
+
+- if ($valueR != $valueL) {
++ if (bccomp($valueR, $valueL) != 0) {
+ if ($len >= $MIN_NUM_BETWEEN) {
+ $betweens[] = array(bcsub($valueL, $len, 0), bcsub($valueL, 1, 0));
+ }
diff --git a/zabbix20.spec b/zabbix20.spec
index f0b31c4..c197421 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -34,7 +34,7 @@
Name: zabbix20
Version: 2.0.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure
Group: Applications/Internet
@@ -65,6 +65,10 @@ Patch2: %{srcname}-2.0.1-no-flash.patch
# Solved in releases after 2.0.5
Patch4: %{srcname}-2.0.5-zbx6290.patch
+# Specific node-ids leave the frontend broken
+# Solved in releases after 2.0.5
+Patch5: %{srcname}-2.0.5-zbx6318.patch
+
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: sqlite-devel
@@ -259,6 +263,7 @@ sed -i '/su zabbix zabbix/d' %{SOURCE5}
%patch2 -p1
rm -f frontend/php/images/flash/zbxclock.swf
%patch4 -p0
+%patch5 -p0
# Remove bundled java libs
rm -rf src/zabbix_java/lib/*.jar
@@ -676,6 +681,9 @@ fi
%files web-pgsql
%changelog
+* Tue Mar 19 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-3
+- Include patch for ZBX-6318
+
* Tue Feb 12 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.5-2
- Include patch for ZBX-6290
More information about the scm-commits
mailing list