Attachment 177985 Details for Bug 215320 – patch to 2.2.16

[patch] patch to 2.2.16

zabbix22_16.patch (text/plain), 4.83 KB, created by pg on 2016-12-15 13:32:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pg

Created: 2016-12-15 13:32:25 UTC

Size: 4.83 KB

patch

obsolete

>Index: zabbix22-server/Makefile
>===================================================================
>--- zabbix22-server/Makefile	(revision 428614)
>+++ zabbix22-server/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zabbix22
>-PORTVERSION=	2.2.15
>+PORTVERSION=	2.2.16
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>Index: zabbix22-server/distinfo
>===================================================================
>--- zabbix22-server/distinfo	(revision 428614)
>+++ zabbix22-server/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1475755867
>-SHA256 (zabbix-2.2.15.tar.gz) = 1dc370a04bc42bf21cdedc2dd53de051ac4a61d20ae83cd7c6e1cdd9c574f653
>-SIZE (zabbix-2.2.15.tar.gz) = 15487398
>+TIMESTAMP = 1481807300
>+SHA256 (zabbix-2.2.16.tar.gz) = 3cfcd8c7c11a2e18298e93f33701210b963a7c0e61d8c14fccfd9a8beef08041
>+SIZE (zabbix-2.2.16.tar.gz) = 15498413
>Index: zabbix22-server/files/zabbix_agentd.in
>===================================================================
>--- zabbix22-server/files/zabbix_agentd.in	(revision 428614)
>+++ zabbix22-server/files/zabbix_agentd.in	(working copy)
>@@ -11,8 +11,10 @@
> #         enable zabbix_agentd.
> # zabbix_agentd_config (string): Set to the standard config file path by
> #         default.
>-# zabbix_agentd_pidfile (string):    Location of the zabbix_agentd pid file
>+# zabbix_agentd_pidfile (string): Location of the zabbix_agent pid file
> #                               Default is /var/run/zabbix/zabbix_agentd.pid
>+# zabbix_agentd_paths (string): Set to standard path by default.  Set a search
>+#         if you have custom userparams that need binaries elsewhere.
> #
> 
> . /etc/rc.subr
>@@ -25,10 +27,12 @@
> : ${zabbix_agentd_enable:=NO}
> : ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf}
> : ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid}
>+: ${zabbix_agentd_paths:=$PATH}
> 
> command="%%PREFIX%%/sbin/${name}"
> required_files="${zabbix_agentd_config}"
> 
>+start_cmd=zabbix_agentd_cmd
> start_precmd=zabbix_agentd_precmd 
> status_precmd=zabbix_agentd_precmd
> stop_precmd=zabbix_agentd_precmd
>@@ -52,4 +56,9 @@
> 	rc_pid=$(check_pidfile ${pidfile} ${command})
> }
> 
>+zabbix_agentd_cmd()
>+{
>+	PATH=$zabbix_agentd_paths $command -c $zabbix_agentd_config
>+}
>+
> run_rc_command "$1"
>Index: zabbix22-server/files/zabbix_proxy.in
>===================================================================
>--- zabbix22-server/files/zabbix_proxy.in	(revision 428614)
>+++ zabbix22-server/files/zabbix_proxy.in	(working copy)
>@@ -15,6 +15,8 @@
> #         default.
> # zabbix_proxy_pidfile (string):    Location of the zabbix_proxy pid file
> #                               Default is /var/run/zabbix/zabbix_proxy.pid
>+# zabbix_proxy_paths (string): Set to standard path by default.  Set a search
>+#         if you have custom userparams that need binaries elsewhere.
> #
> 
> . /etc/rc.subr
>@@ -31,6 +33,7 @@
> command="%%PREFIX%%/sbin/${name}"
> required_files="${zabbix_proxy_config}"
> 
>+start_cmd=zabbix_proxy_cmd
> start_precmd=zabbix_proxy_precmd 
> status_precmd=zabbix_proxy_precmd
> stop_precmd=zabbix_proxy_precmd
>@@ -54,4 +57,9 @@
> 	rc_pid=$(check_pidfile ${pidfile} ${command})
> }
> 
>+zabbix_proxy_cmd()
>+{
>+	PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config
>+}
>+
> run_rc_command "$1"
>Index: zabbix22-server/files/zabbix_server.in
>===================================================================
>--- zabbix22-server/files/zabbix_server.in	(revision 428614)
>+++ zabbix22-server/files/zabbix_server.in	(working copy)
>@@ -15,6 +15,8 @@
> #         default.
> # zabbix_server_pidfile (string):    Location of the zabbix_server pid file
> #                               Default is /var/run/zabbix/zabbix_server.pid
>+# zabbix_server_paths (string): Set to standard path by default.  Set a search
>+#         if you have custom userparams that need binaries elsewhere.
> #
> 
> . /etc/rc.subr
>@@ -27,10 +29,12 @@
> : ${zabbix_server_enable:=NO}
> : ${zabbix_server_config:=%%ETCDIR%%/${name}.conf}
> : ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid}
>+: ${zabbix_server_paths:=$PATH}
> 
> command="%%PREFIX%%/sbin/${name}"
> required_files="${zabbix_server_config}"
> 
>+start_cmd=zabbix_server_cmd
> start_precmd=zabbix_server_precmd 
> status_precmd=zabbix_server_precmd
> stop_precmd=zabbix_server_precmd
>@@ -54,4 +58,9 @@
> 	rc_pid=$(check_pidfile ${pidfile} ${command})
> }
> 
>+zabbix_server_cmd()
>+{
>+	PATH=$zabbix_server_paths $command -c $zabbix_server_config
>+}
>+
> run_rc_command "$1"
>Index: zabbix22-frontend/Makefile
>===================================================================
>--- zabbix22-frontend/Makefile	(revision 424764)
>+++ zabbix22-frontend/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> USE_PHP=	bcmath ctype gd pcre snmp sockets mbstring session dom xml \
> 		xmlreader xmlwriter simplexml gettext ldap
>-WANT_PHP_WEB=	yes
>+USES+=		php:web
> 
> OPTIONS_DEFINE=	MYSQL MYSQLI PGSQL SQLITE ORACLE
> OPTIONS_DEFAULT=	MYSQL MYSQLI

Actions: View | Diff

Attachments on bug 215320: 177985