Date: Tue, 5 Apr 2016 20:13:50 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412586 - in head/net-mgmt: zabbix3-agent zabbix3-proxy zabbix3-server Message-ID: <201604052013.u35KDoSE034263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Apr 5 20:13:49 2016 New Revision: 412586 URL: https://svnweb.freebsd.org/changeset/ports/412586 Log: net-mgmt/zabbix3-{server,proxy,agent}: Add SSL/TLS support PR: 208029 Submitted by: Martin Waschbuesch <martin@waschbuesch.de> Approved by: pakhom@pakhom.spb.ru (maintainer) Modified: head/net-mgmt/zabbix3-agent/Makefile head/net-mgmt/zabbix3-proxy/Makefile head/net-mgmt/zabbix3-server/Makefile Modified: head/net-mgmt/zabbix3-agent/Makefile ============================================================================== --- head/net-mgmt/zabbix3-agent/Makefile Tue Apr 5 19:50:23 2016 (r412585) +++ head/net-mgmt/zabbix3-agent/Makefile Tue Apr 5 20:13:49 2016 (r412586) @@ -5,10 +5,15 @@ PORTNAME= zabbix3 CATEGORIES= net-mgmt PKGNAMESUFFIX= -agent +MAINTAINER= pakhom@pakhom.spb.ru +COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS + +LICENSE= GPLv2 + MASTERDIR= ${.CURDIR}/../zabbix3-server PLIST= ${PKGDIR}/pkg-plist.agent OPTIONS_DEFINE= IPV6 -OPTIONS_DEFAULT= IPV6 +OPTIONS_DEFAULT= IPV6 OPENSSL .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix3-proxy/Makefile ============================================================================== --- head/net-mgmt/zabbix3-proxy/Makefile Tue Apr 5 19:50:23 2016 (r412585) +++ head/net-mgmt/zabbix3-proxy/Makefile Tue Apr 5 20:13:49 2016 (r412586) @@ -5,6 +5,11 @@ PORTNAME= zabbix3 CATEGORIES= net-mgmt PKGNAMESUFFIX= -proxy +MAINTAINER= pakhom@pakhom.spb.ru +COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS + +LICENSE= GPLv2 + MASTERDIR= ${.CURDIR}/../zabbix3-server .include "${MASTERDIR}/Makefile" Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Tue Apr 5 19:50:23 2016 (r412585) +++ head/net-mgmt/zabbix3-server/Makefile Tue Apr 5 20:13:49 2016 (r412586) @@ -3,7 +3,7 @@ PORTNAME= zabbix3 PORTVERSION= 3.0.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -72,7 +72,8 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 -OPTIONS_DEFAULT= IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH + +OPTIONS_DEFAULT= IPV6 FPING JABBER CURL UNIXODBC MYSQL SSH OPENSSL OPTIONS_SUB= yes CURL_DESC= Support for web monitoring @@ -86,9 +87,10 @@ ODBC_DESC= Support for database checks JAVAGW_DESC= Support for Java gateway LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) -OPTIONS_SINGLE= DB ODBC +OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL MYSQL_CONFIGURE_WITH= mysql MYSQL_USE= MYSQL=yes @@ -123,6 +125,9 @@ IODBC_LIB_DEPENDS= libiodbc.so:databases UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +.else +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 @@ -136,8 +141,23 @@ JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 +OPENSSL_CONFIGURE_WITH= openssl +OPENSSL_USE= OPENSSL=yes + +WITH_OPENSSL_PORT=yes + +GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls + +POLARSSL_CONFIGURE_WITH=mbedtls +POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 + .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +WITH_OPENSSL_PORT=yes +.endif + post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604052013.u35KDoSE034263>