[zabbix20/el5] Solve /var/run permissions, add patch ZBX-6526

[Volker Fröhlich]

commit c8eae084d729d4d2de9dc642c48178a0beff3637
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon May 6 23:38:50 2013 +0200

    Solve /var/run permissions, add patch ZBX-6526
    
    - Add patch for ZBX-6526
    - Solve permission problem with /var/run/zabbix in Fedora (BZ#904041)

 zabbix-2.0.6-ZBX-6526.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 zabbix-tmpfiles.conf        |    2 +-
 zabbix20.spec               |    9 ++++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)
---
diff --git a/zabbix-2.0.6-ZBX-6526.patch b/zabbix-2.0.6-ZBX-6526.patch
new file mode 100644
index 0000000..56a1def
--- /dev/null
+++ b/zabbix-2.0.6-ZBX-6526.patch
@@ -0,0 +1,41 @@
+Index: src/zabbix_proxy/servercomms.c
+===================================================================
+--- src/zabbix_proxy/servercomms.c	(revision 35199)
++++ src/zabbix_proxy/servercomms.c	(revision 35235)
+@@ -165,7 +165,7 @@
+ 	if (FAIL == send_data_to_server(sock, j->buffer))
+ 		goto exit;
+ 
+-	if (FAIL == zbx_recv_response(sock, NULL, 0, 0))
++	if (SUCCEED != zbx_recv_response(sock, NULL, 0, 0))
+ 		goto exit;
+ 
+ 	ret = SUCCEED;
+Index: src/zabbix_server/server.c
+===================================================================
+--- src/zabbix_server/server.c	(revision 35199)
++++ src/zabbix_server/server.c	(revision 35235)
+@@ -588,6 +588,9 @@
+ 	/* need to set trigger status to UNKNOWN since last run */
+ 	DBupdate_triggers_status_after_restart();
+ 
++	/* make initial configuration sync before worker processes are forked */
++	DCsync_configuration();
++
+ 	DBclose();
+ 
+ 	if (ZBX_MUTEX_ERROR == zbx_mutex_create_force(&node_sync_access, ZBX_MUTEX_NODE_SYNC))
+Index: src/zabbix_server/dbconfig/dbconfig.c
+===================================================================
+--- src/zabbix_server/dbconfig/dbconfig.c	(revision 35199)
++++ src/zabbix_server/dbconfig/dbconfig.c	(revision 35235)
+@@ -51,6 +51,9 @@
+ 
+ 	zabbix_log(LOG_LEVEL_DEBUG, "In main_dbconfig_loop()");
+ 
++	/* the initial configuration sync is done by server before worker processes are forked */
++	zbx_sleep_loop(CONFIG_CONFSYNCER_FREQUENCY);
++
+ 	zbx_setproctitle("%s [connecting to the database]", get_process_type_string(process_type));
+ 
+ 	DBconnect(ZBX_DB_CONNECT_NORMAL);
diff --git a/zabbix-tmpfiles.conf b/zabbix-tmpfiles.conf
index 0e4755a..3099a5d 100644
--- a/zabbix-tmpfiles.conf
+++ b/zabbix-tmpfiles.conf
@@ -1 +1 @@
-D /var/run/zabbix 0755 zabbix zabbix -
+D /var/run/zabbix 0775 zabbix zabbix -
diff --git a/zabbix20.spec b/zabbix20.spec
index f21f39f..55479ee 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -34,7 +34,7 @@
 
 Name:           zabbix20
 Version:        2.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -60,6 +60,9 @@ Patch1:         %{srcname}-2.0.3-fonts-config.patch
 # https://support.zabbix.com/browse/ZBX-4794
 Patch2:         %{srcname}-2.0.1-no-flash.patch
 
+# https://support.zabbix.com/browse/ZBX-6526
+Patch4:         %{srcname}-2.0.6-ZBX-6526.patch
+
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
 BuildRequires:   sqlite-devel
@@ -670,6 +673,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Mon Apr 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.6-2
+- Add patch for ZBX-6526
+- Solve permission problem with /var/run/zabbix in Fedora (BZ#904041)
+
 * Mon Apr 22 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.6-1
 - New upstream release
 - Drop ZBX-6290 and ZBX-6318 patches