From owner-svn-ports-head@freebsd.org Wed Oct 12 19:18:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE900C0F970; Wed, 12 Oct 2016 19:18:36 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81C3EC85; Wed, 12 Oct 2016 19:18:36 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9CJIZ90035586; Wed, 12 Oct 2016 19:18:35 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9CJIZ7D035580; Wed, 12 Oct 2016 19:18:35 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201610121918.u9CJIZ7D035580@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 12 Oct 2016 19:18:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423886 - in head/net-mgmt/zabbix3-server: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2016 19:18:36 -0000 Author: pi Date: Wed Oct 12 19:18:35 2016 New Revision: 423886 URL: https://svnweb.freebsd.org/changeset/ports/423886 Log: net-mgmt/zabbix3-server: 3.0.4 -> 3.0.5 - RC scripts: add zabbix_server_paths, zabbix_agentd_paths, zabbix_proxy_paths - Fix net-snmp depends for -agent PR: 213267 Changes: http://www.zabbix.com/rn3.0.5.php Submitted by: Pakhom Golynga (maintainer) Modified: head/net-mgmt/zabbix3-server/Makefile head/net-mgmt/zabbix3-server/distinfo head/net-mgmt/zabbix3-server/files/zabbix_agentd.in head/net-mgmt/zabbix3-server/files/zabbix_proxy.in head/net-mgmt/zabbix3-server/files/zabbix_server.in Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Wed Oct 12 19:14:07 2016 (r423885) +++ head/net-mgmt/zabbix3-server/Makefile Wed Oct 12 19:18:35 2016 (r423886) @@ -2,8 +2,8 @@ # $FreeBSD$ 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 @@ COMMENT= Enterprise-class open source di 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 @@ 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 @@ -89,13 +88,13 @@ OPTIONS_SINGLE_ODBC= IODBC UNIXODBC 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 @@ POLARSSL_LIB_DEPENDS= libmbedtls.so:secu .include .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" Modified: head/net-mgmt/zabbix3-server/distinfo ============================================================================== --- head/net-mgmt/zabbix3-server/distinfo Wed Oct 12 19:14:07 2016 (r423885) +++ head/net-mgmt/zabbix3-server/distinfo Wed Oct 12 19:18:35 2016 (r423886) @@ -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 Modified: head/net-mgmt/zabbix3-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_agentd.in Wed Oct 12 19:14:07 2016 (r423885) +++ head/net-mgmt/zabbix3-server/files/zabbix_agentd.in Wed Oct 12 19:18:35 2016 (r423886) @@ -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" Modified: head/net-mgmt/zabbix3-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_proxy.in Wed Oct 12 19:14:07 2016 (r423885) +++ head/net-mgmt/zabbix3-server/files/zabbix_proxy.in Wed Oct 12 19:18:35 2016 (r423886) @@ -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" Modified: head/net-mgmt/zabbix3-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_server.in Wed Oct 12 19:14:07 2016 (r423885) +++ head/net-mgmt/zabbix3-server/files/zabbix_server.in Wed Oct 12 19:18:35 2016 (r423886) @@ -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"