[zabbix/f14/master] - updated to 1.8.4 - fixes zabbix_agent fail to start on IPv4-only host (#664639)

[Dan Horák]

commit 7d34a151762510bd293e91a90918377df036f302
Author: Dan Horák <dan at danny.cz>
Date:   Tue Jan 4 22:29:56 2011 +0100

    - updated to 1.8.4
    - fixes zabbix_agent fail to start on IPv4-only host (#664639)

 zabbix-1.8.3-email-fix.patch                       |   53 --------------------
 zabbix-1.8.3-fonts-config.patch                    |   12 -----
 ...1.8.3-config.patch => zabbix-1.8.4-config.patch |    8 ++--
 zabbix-1.8.4-fonts-config.patch                    |   12 +++++
 zabbix.spec                                        |   21 +++-----
 5 files changed, 25 insertions(+), 81 deletions(-)
---
diff --git a/zabbix-1.8.3-config.patch b/zabbix-1.8.4-config.patch
similarity index 50%
rename from zabbix-1.8.3-config.patch
rename to zabbix-1.8.4-config.patch
index d4d5979..9eee3f6 100644
--- a/zabbix-1.8.3-config.patch
+++ b/zabbix-1.8.4-config.patch
@@ -1,7 +1,7 @@
-diff -up zabbix-1.8.3/frontends/php/include/config.inc.php.orig zabbix-1.8.3/frontends/php/include/config.inc.php
---- zabbix-1.8.3/frontends/php/include/config.inc.php.orig	2010-08-16 10:19:33.000000000 +0200
-+++ zabbix-1.8.3/frontends/php/include/config.inc.php	2010-08-17 09:02:34.000000000 +0200
-@@ -113,8 +113,7 @@ function __autoload($class_name){
+diff -up zabbix-1.8.4/frontends/php/include/config.inc.php.orig zabbix-1.8.4/frontends/php/include/config.inc.php
+--- zabbix-1.8.4/frontends/php/include/config.inc.php.orig	2011-01-04 14:57:51.000000000 +0100
++++ zabbix-1.8.4/frontends/php/include/config.inc.php	2011-01-04 14:57:52.000000000 +0100
+@@ -116,8 +116,7 @@ function __autoload($class_name){
  	$ZBX_LOCALNODEID = 0;
  	$ZBX_LOCMASTERID = 0;
  
diff --git a/zabbix-1.8.4-fonts-config.patch b/zabbix-1.8.4-fonts-config.patch
new file mode 100644
index 0000000..d835e83
--- /dev/null
+++ b/zabbix-1.8.4-fonts-config.patch
@@ -0,0 +1,12 @@
+diff -up zabbix-1.8.4/frontends/php/include/defines.inc.php.f zabbix-1.8.4/frontends/php/include/defines.inc.php
+--- zabbix-1.8.4/frontends/php/include/defines.inc.php.f	2011-01-04 20:48:57.000000000 +0100
++++ zabbix-1.8.4/frontends/php/include/defines.inc.php	2011-01-04 20:49:14.000000000 +0100
+@@ -35,7 +35,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
+ 
diff --git a/zabbix.spec b/zabbix.spec
index 0b89a9e..62dabaa 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -6,8 +6,8 @@
 #   various backup files (*.rpm{orig,new,save}, *~ etc) in that dir.
 
 Name:           zabbix
-Version:        1.8.3
-Release:        3%{?dist}
+Version:        1.8.4
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -20,13 +20,9 @@ Source3:        zabbix-agent.init
 Source4:        zabbix-proxy.init
 Source5:        zabbix-logrotate.in
 # local rules for config files
-Patch0:         zabbix-1.8.3-config.patch
-# close fd on exec - https://bugzilla.redhat.com/show_bug.cgi?id=559221
-Patch1:         zabbix-1.8.3-cloexec.patch
+Patch0:         zabbix-1.8.4-config.patch
 # local rules for config files - fonts
-Patch2:         zabbix-1.8.3-fonts-config.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=656072
-Patch3:         zabbix-1.8.3-email-fix.patch
+Patch1:         zabbix-1.8.4-fonts-config.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -250,18 +246,15 @@ Zabbix web frontend for SQLite
 %prep
 %setup0 -q
 %patch0 -p1
-%patch1 -p1 -b .cloexec
 
 # DejaVu fonts doesn't exist on EL <= 5
 %if 0%{?fedora} || 0%{?rhel} >= 6
-%patch2 -p1
+%patch1 -p1
 
 # remove included fonts
 rm -rf frontends/php/fonts
 %endif
 
-%patch3 -p1 -b .email-fix
-
 # remove executable permissions
 chmod a-x upgrades/dbpatches/1.8/mysql/upgrade
 
@@ -591,6 +584,10 @@ fi
 
 
 %changelog
+* Tue Jan  4 2011 Dan Horák <dan[at]danny.cz> - 1.8.4-1
+- updated to 1.8.4
+- fixes zabbix_agent fail to start on IPv4-only host (#664639)
+
 * Tue Nov 23 2010 Dan Horák <dan[at]danny.cz> - 1.8.3-3
 - zabbix emailer doesn't handle multiline responses (#656072)