svn commit: r423179 - in head/net-mgmt/zabbix3-server: . files

[Kurt Jaeger]

Author: pi
Date: Mon Oct  3 09:36:20 2016
New Revision: 423179
URL: https://svnweb.freebsd.org/changeset/ports/423179

Log:
  net-mgmt/zabbix3: add missing patches for the PID fix
  
  PR:		209893
  Pointy hat to:	pi
  Submitted by:	pg at pakhom.spb.ru (maintainer)
  MFH:		2016Q3

Added:
  head/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c   (contents, props changed)
  head/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c   (contents, props changed)
  head/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c   (contents, props changed)
Modified:
  head/net-mgmt/zabbix3-server/Makefile

Modified: head/net-mgmt/zabbix3-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix3-server/Makefile	Mon Oct  3 09:26:34 2016	(r423178)
+++ head/net-mgmt/zabbix3-server/Makefile	Mon Oct  3 09:36:20 2016	(r423179)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zabbix3
 PORTVERSION=	3.0.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server

Added: head/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c	Mon Oct  3 09:36:20 2016	(r423179)
@@ -0,0 +1,11 @@
+--- src/zabbix_agent/zabbix_agentd.c.orig	2016-05-13 14:37:25.696606000 +0300
++++ src/zabbix_agent/zabbix_agentd.c	2016-05-13 14:49:45.011554761 +0300
+@@ -521,7 +521,7 @@
+ 		CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, LIBDIR "/modules");
+ 
+ 	if (NULL == CONFIG_PID_FILE)
+-		CONFIG_PID_FILE = "/tmp/zabbix_agentd.pid";
++		CONFIG_PID_FILE = "/var/run/zabbix/zabbix_agentd.pid";
+ #endif
+ 	if (NULL == CONFIG_LOG_TYPE_STR)
+ 		CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);

Added: head/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c	Mon Oct  3 09:36:20 2016	(r423179)
@@ -0,0 +1,11 @@
+--- src/zabbix_proxy/proxy.c.orig	2016-04-20 12:51:20.000000000 +0300
++++ src/zabbix_proxy/proxy.c	2016-05-13 14:46:44.193569184 +0300
+@@ -389,7 +389,7 @@
+ 		CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
+ 
+ 	if (NULL == CONFIG_PID_FILE)
+-		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid");
++		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid");
+ 
+ 	if (NULL == CONFIG_TMPDIR)
+ 		CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");

Added: head/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c	Mon Oct  3 09:36:20 2016	(r423179)
@@ -0,0 +1,11 @@
+--- src/zabbix_server/server.c.orig	2016-04-20 12:51:20.000000000 +0300
++++ src/zabbix_server/server.c	2016-05-13 14:20:17.603677788 +0300
+@@ -369,7 +369,7 @@
+ 		CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
+ 
+ 	if (NULL == CONFIG_PID_FILE)
+-		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid");
++		CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid");
+ 
+ 	if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
+ 		CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DATADIR "/zabbix/alertscripts");