Automatic commit of package [zabbix] minor release [3.4.10-0.beta1].

Created by command:

/usr/bin/tito tag --use-version 3.4.10 --use-release 0.beta1%{?dist}
tags/zabbix-3.4.10-0.beta1^0 zabbix-3.4.10-0.beta1
Daniel Berteaud 7 years ago
parent 80de86d333
commit 742795fa27
  1. 2
      .tito/packages/zabbix
  2. 1
      zabbix-3.4.10.tar.gz
  3. 30
      zabbix-3.4.9-fix_update_dependant_lld_items_zbx13712.patch
  4. 11
      zabbix.spec

@ -1 +1 @@
3.4.9-3.beta0 ./ 3.4.10-0.beta1 ./

@ -0,0 +1 @@
.git/annex/objects/2z/GK/SHA256E-s17300622--cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b.tar.gz/SHA256E-s17300622--cdee0fd44e11ae214b2cc252974da22f3627c326ea2c61a0315af95165c52d1b.tar.gz

@ -1,30 +0,0 @@
diff -Nur -x '*.orig' -x '*.rej' zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php mezzanine_patched_zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php
--- zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php 2018-05-09 11:57:42.000000000 +0200
+++ mezzanine_patched_zabbix-3.4.9/frontends/php/include/classes/api/services/CItemGeneral.php 2018-05-29 11:25:39.130154434 +0200
@@ -1630,7 +1630,7 @@
$master_itemids = [];
foreach ($items as $item) {
- if ($item['type'] == ITEM_TYPE_DEPENDENT) {
+ if ($item['type'] == ITEM_TYPE_DEPENDENT && array_key_exists('master_itemid', $item)) {
$master_itemids[$item['master_itemid']] = true;
}
}
@@ -1645,7 +1645,7 @@
$host_master_items = [];
foreach ($items as $item) {
- if ($item['type'] != ITEM_TYPE_DEPENDENT) {
+ if ($item['type'] == ITEM_TYPE_DEPENDENT && array_key_exists('master_itemid', $item)) {
continue;
}
$master_item = $master_items[$item['master_itemid']];
@@ -1653,7 +1653,7 @@
if (!array_key_exists($item['hostid'], $host_master_items)) {
$host_master_items[$item['hostid']] = [];
}
- if ($master_item['hostid'] != $item['hostid']) {
+ if (bccomp($master_item['hostid'], $item['hostid']) != 0) {
if (!array_key_exists($master_item['key_'], $host_master_items[$item['hostid']])) {
$inherited_master_items = DB::select('items', [
'output' => ['itemid'],

@ -1,6 +1,6 @@
Name: zabbix Name: zabbix
Version: 3.4.9 Version: 3.4.10
Release: 3.beta0%{?dist} Release: 0.beta1%{?dist}
Summary: Open-source monitoring solution for your IT infrastructure Summary: Open-source monitoring solution for your IT infrastructure
Group: Applications/Internet Group: Applications/Internet
@ -22,8 +22,6 @@ Source103: zabbix-agent.service
Source104: zabbix-proxy.init Source104: zabbix-proxy.init
Source105: zabbix-proxy.service Source105: zabbix-proxy.service
Patch0: zabbix-3.4.9-fix_update_dependant_lld_items_zbx13712.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mysql-devel BuildRequires: mysql-devel
@ -218,7 +216,6 @@ Zabbix web frontend for PostgreSQL
%prep %prep
%setup -q %setup -q
%patch0 -p1
mkdir SELinux mkdir SELinux
mv %{SOURCE6} %{SOURCE7} SELinux mv %{SOURCE6} %{SOURCE7} SELinux
@ -663,6 +660,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Jun 06 2018 Daniel Berteaud <daniel@firewall-services.com> 3.4.10-0.beta1
- Update to 3.4.10
- Remove local patch to fix editing dependant item prototypes
* Tue May 29 2018 Daniel Berteaud <daniel@firewall-services.com> 3.4.9-3.beta0 * Tue May 29 2018 Daniel Berteaud <daniel@firewall-services.com> 3.4.9-3.beta0
- Fix patch spacing issue (daniel@firewall-services.com) - Fix patch spacing issue (daniel@firewall-services.com)

Loading…
Cancel
Save