cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-mgmt/zabbix32-server: 3.2.0 -> 3.2.1

Browse Source 
- RC scripts: add zabbix_server_paths, zabbix_agentd_paths, zabbix_proxy_paths
- Fix net-snmp depends for -agent

PR:		213380
Changes:	http://www.zabbix.com/rn3.2.1.php
Submitted by:	Pakhom Golynga <pg@pakhom.spb.ru> (maintainer)
This commit is contained in:
Kurt Jaeger 2016-10-12 19:21:36 +00:00
parent fbf91aa440
commit a11796ddcf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=423888
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net-mgmt/zabbix32-server/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= zabbix32
PORTVERSION= 3.2.0
PORTVERSION= 3.2.1
PORTREVISION?= 0
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@ -14,8 +14,6 @@ COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/
LICENSE= GPLv2
LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
CONFLICTS= zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix22${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}-[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]*
IGNORE_WITH_PHP= 52
@ -58,6 +56,7 @@ CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \
--with-iconv=${ICONV_PREFIX}
.if ${ZABBIX_BUILD} != "agent"
LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
USES+= execinfo
CPPFLAGS+= -I${LOCALBASE}/include
@ -149,7 +148,7 @@ POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13
.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 @@ post-patch:
.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"

6
net-mgmt/zabbix32-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1474277998
SHA256 (zabbix-3.2.0.tar.gz) = 036d1042359cb62e414d7fcf58bb09bcbf1eabfd7bc8d5dd60d0f3095765cd5c
SIZE (zabbix-3.2.0.tar.gz) = 15806267
TIMESTAMP = 1476192256
SHA256 (zabbix-3.2.1.tar.gz) = 8926b96ef05cba041d05329130f40e8e1311ad201e58c75d22005eda4075c091
SIZE (zabbix-3.2.1.tar.gz) = 15815404

11
net-mgmt/zabbix32-server/files/zabbix_agentd.in
View File

@ -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 @@ load_rc_config $name
: ${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 @@ zabbix_agentd_precmd()
rc_pid=$(check_pidfile ${pidfile} ${command})
}
zabbix_agentd_cmd()
{
PATH=$zabbix_agentd_paths $command -c $zabbix_agentd_config
}
run_rc_command "$1"

8
net-mgmt/zabbix32-server/files/zabbix_proxy.in
View File

@ -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 @@ load_rc_config $name
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 @@ zabbix_proxy_precmd()
rc_pid=$(check_pidfile ${pidfile} ${command})
}
zabbix_proxy_cmd()
{
PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config
}
run_rc_command "$1"

9
net-mgmt/zabbix32-server/files/zabbix_server.in
View File

@ -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 @@ load_rc_config $name
: ${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 @@ zabbix_server_precmd()
rc_pid=$(check_pidfile ${pidfile} ${command})
}
zabbix_server_cmd()
{
PATH=$zabbix_server_paths $command -c $zabbix_server_config
}
run_rc_command "$1"