Attachment 175625 Details for Bug 213267 – patch 3.0.5

[patch] patch 3.0.5

zabbix3_5.patch (text/plain), 6.72 KB, created by pg on 2016-10-11 14:00:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pg

Created: 2016-10-11 14:00:08 UTC

Size: 6.72 KB

patch

obsolete

>diff -uNr zabbix3-server.orig/Makefile zabbix3-server/Makefile
>--- zabbix3-server.orig/Makefile	2016-10-11 15:00:11.759369000 +0300
>+++ zabbix3-server/Makefile	2016-10-11 16:41:31.817364000 +0300
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/net-mgmt/zabbix3-server/Makefile 423179 2016-10-03 09:36:20Z pi $
> 
> PORTNAME=	zabbix3
>-PORTVERSION=	3.0.4
>-PORTREVISION?=	1
>+PORTVERSION=	3.0.5
>+PORTREVISION?=	0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
> PKGNAMESUFFIX?=	-server
>@@ -14,9 +14,7 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
>-
>-CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]*
>+CONFLICTS=	zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* zabbix32${PKGNAMESUFFIX}-[0-9]*
> 
> IGNORE_WITH_PHP=	52
> IGNORE_WITH_MYSQL=	41
>@@ -58,6 +56,7 @@
> 			--with-iconv=${ICONV_PREFIX}
> 
> .if ${ZABBIX_BUILD} != "agent"
>+LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
> USES+=		execinfo
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -89,13 +88,13 @@
> OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS POLARSSL
> 
> MYSQL_CONFIGURE_WITH=	mysql
>-MYSQL_USES+=	mysql
>+MYSQL_USES+=		mysql
> 
> PGSQL_CONFIGURE_WITH=	postgresql
>-PGSQL_USES+=	pgsql
>+PGSQL_USES+=		pgsql
> 
> SQLITE_CONFIGURE_WITH=	sqlite3
>-SQLITE_USES+=	sqlite:3
>+SQLITE_USES+=		sqlite:3
> 
> ORACLE_CONFIGURE_WITH=	oracle
> 
>@@ -149,7 +148,7 @@
> .include <bsd.port.pre.mk>
> 
> .if ${SSL_DEFAULT} == base
>-IGNORE_FreeBSD_9=	Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl)
>+IGNORE_FreeBSD_9=	Requires OpenSSL >= 1.0.1 (set DEFAULT_VERSIONS+=ssl=openssl)
> .endif
> 
> .if ${SSL_DEFAULT:Mlibressl*}
>@@ -165,16 +164,22 @@
> .if ${ZABBIX_BUILD} == "server"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
> 		${WRKSRC}/conf/zabbix_server*.conf
>+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
>+		${WRKSRC}/conf/zabbix_server*.conf
> .endif
> 
> .if ${ZABBIX_BUILD} == "proxy"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \
> 		${WRKSRC}/conf/zabbix_proxy*.conf
>+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
>+		${WRKSRC}/conf/zabbix_proxy*.conf
> .endif
> 
> .if ${ZABBIX_BUILD} == "agent"
> 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \
> 		${WRKSRC}/conf/zabbix_agentd*.conf
>+	@${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \
>+		${WRKSRC}/conf/zabbix_agentd*.conf
> .endif
> 
> .if ${ZABBIX_BUILD} != "agent"
>diff -uNr zabbix3-server.orig/distinfo zabbix3-server/distinfo
>--- zabbix3-server.orig/distinfo	2016-10-11 15:00:11.761838000 +0300
>+++ zabbix3-server/distinfo	2016-10-05 11:20:45.759249000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1474053011
>-SHA256 (zabbix-3.0.4.tar.gz) = 9fa47d97843b6ca9f550d706b40ee6b35b76c5165ff32ff11ef0474f161e7700
>-SIZE (zabbix-3.0.4.tar.gz) = 15403727
>+TIMESTAMP = 1475655645
>+SHA256 (zabbix-3.0.5.tar.gz) = 641e608765e34edfc04ec005f7c501430105b7c3ec9210bbf52b73fda530c1a1
>+SIZE (zabbix-3.0.5.tar.gz) = 15412400
>diff -uNr zabbix3-server.orig/files/zabbix_agentd.in zabbix3-server/files/zabbix_agentd.in
>--- zabbix3-server.orig/files/zabbix_agentd.in	2016-10-11 15:00:11.774771000 +0300
>+++ zabbix3-server/files/zabbix_agentd.in	2016-10-05 15:19:16.387258000 +0300
>@@ -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_agent 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"
>diff -uNr zabbix3-server.orig/files/zabbix_proxy.in zabbix3-server/files/zabbix_proxy.in
>--- zabbix3-server.orig/files/zabbix_proxy.in	2016-10-11 15:00:11.769888000 +0300
>+++ zabbix3-server/files/zabbix_proxy.in	2016-10-06 14:47:06.079460000 +0300
>@@ -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"
>diff -uNr zabbix3-server.orig/files/zabbix_server.in zabbix3-server/files/zabbix_server.in
>--- zabbix3-server.orig/files/zabbix_server.in	2016-10-11 15:00:11.779882000 +0300
>+++ zabbix3-server/files/zabbix_server.in	2016-10-06 14:44:45.650587000 +0300
>@@ -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"

Flags:

pg: maintainer-approval+

Actions: View | Diff

Attachments on bug 213267: 175486 | 175625