diff options
| author | pi <pi@FreeBSD.org> | 2016-10-03 17:36:20 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2016-10-03 17:36:20 +0800 |
| commit | 2e7b1ee316e1dcf1062495decd25eea8a2dbe80b (patch) | |
| tree | 8e759dcad3b534bff3a3f086807bfeba0a83ed5b /net-mgmt | |
| parent | ac4e992369e9e68c8464093d61e0f6b3934240a8 (diff) | |
| download | freebsd-ports-gnome-2e7b1ee316e1dcf1062495decd25eea8a2dbe80b.tar.gz freebsd-ports-gnome-2e7b1ee316e1dcf1062495decd25eea8a2dbe80b.tar.zst freebsd-ports-gnome-2e7b1ee316e1dcf1062495decd25eea8a2dbe80b.zip | |
net-mgmt/zabbix3: add missing patches for the PID fix
PR: 209893
Pointy hat to: pi
Submitted by: pg@pakhom.spb.ru (maintainer)
MFH: 2016Q3
Diffstat (limited to 'net-mgmt')
4 files changed, 34 insertions, 1 deletions
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile index 953590a55df6..896219604b41 100644 --- a/net-mgmt/zabbix3-server/Makefile +++ b/net-mgmt/zabbix3-server/Makefile @@ -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 diff --git a/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c b/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c new file mode 100644 index 000000000000..35431dbadae2 --- /dev/null +++ b/net-mgmt/zabbix3-server/files/patch-src_zabbix_agent_zabbix_agentd.c @@ -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); diff --git a/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c b/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c new file mode 100644 index 000000000000..7c2b91ded88f --- /dev/null +++ b/net-mgmt/zabbix3-server/files/patch-src_zabbix_proxy_proxy.c @@ -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"); diff --git a/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c b/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c new file mode 100644 index 000000000000..0bf2b74b2efe --- /dev/null +++ b/net-mgmt/zabbix3-server/files/patch-src_zabbix_server_server.c @@ -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"); |