Djam/zabbix
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/zabbix.git synced 2025-02-23 18:02:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from import/zabbix:rosa2014.1

Browse source 
Backport update to 2.0.14
This commit is contained in:
dsilakov 2015-01-26 19:53:19 +04:00
commit 8712f0716b
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,2 +1,3 @@
sources:
"zabbix-2.0.1-free.tar.gz": f89cd75d92e5c9e8be8067742c26930131310b07
zabbix-2.0.1-free.tar.gz: f89cd75d92e5c9e8be8067742c26930131310b07
zabbix-2.0.14.tar.gz: 72ad425939517b93a773e20d42a26949f524e827

12
zabbix-2.0.1-fonts-config.patch
View file

@ -1,12 +0,0 @@
diff -up zabbix-2.0.1/frontends/php/include/defines.inc.php.orig zabbix-2.0.1/frontends/php/include/defines.inc.php
--- zabbix-2.0.1/frontends/php/include/defines.inc.php.orig 2012-06-27 23:03:03.000000000 +0200
+++ zabbix-2.0.1/frontends/php/include/defines.inc.php 2012-07-12 16:19:11.000000000 +0200
@@ -31,7 +31,7 @@ define('ZBX_PERIOD_DEFAULT', 3600); //
define('ZBX_WIDGET_ROWS', 20);
-define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18)
+define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name
define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up

12
zabbix-2.0.14-fonts-config.patch Normal file
View file

@ -0,0 +1,12 @@
diff -Naur zabbix-2.0.14.orig/frontends/php/include/defines.inc.php zabbix-2.0.14/frontends/php/include/defines.inc.php
--- zabbix-2.0.14.orig/frontends/php/include/defines.inc.php 2015-01-26 06:17:53.507225392 -0500
+++ zabbix-2.0.14/frontends/php/include/defines.inc.php 2015-01-26 06:18:22.643275950 -0500
@@ -34,7 +34,7 @@
define('ZBX_WIDGET_ROWS', 20);
-define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18)
+define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name
define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up

9
zabbix.spec
View file

@ -9,12 +9,12 @@
Summary: Open-source monitoring solution for your IT infrastructure
Name: zabbix
Version: 2.0.1
Release: 2
Version: 2.0.14
Release: 1
License: GPLv2+
Group: Monitoring
Url: http://www.zabbix.com/
Source0: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}-free.tar.gz
Source0: http://downloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
# upstream tarball minus src/zabbix_java/lib/org-json-2010-12-28.jar
#Source0: %{srcname}-%{version}-free.tar.gz
Source1: zabbix-web.conf
@ -33,7 +33,7 @@ Source16: zabbix-server-sqlite3.service
# local rules for config files
Patch0: zabbix-2.0.1-config.patch
# local rules for config files - fonts
Patch1: zabbix-2.0.1-fonts-config.patch
Patch1: zabbix-2.0.14-fonts-config.patch
# remove flash content (#737337)
# https://support.zabbix.com/browse/ZBX-4794
Patch2: zabbix-2.0.1-no-flash.patch
@ -83,7 +83,6 @@ multitude of servers.
%config(noreplace) %{_sysconfdir}/tmpfiles.d/zabbix.conf
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/lib/%{srcname}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/%{srcname}
%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{srcname}
%{_bindir}/zabbix_get
%{_bindir}/zabbix_sender
%{_mandir}/man1/zabbix_get.1*