diff --git a/net-mgmt/zabbix5-frontend/Makefile b/net-mgmt/zabbix5-frontend/Makefile index ee166658e4ef..41188ad76b45 100644 --- a/net-mgmt/zabbix5-frontend/Makefile +++ b/net-mgmt/zabbix5-frontend/Makefile @@ -1,33 +1,32 @@ # Created by: Pakhom Golynga PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -frontend MASTERDIR= ${.CURDIR}/../zabbix5-server -NO_BUILD= yes -NO_ARCH= yes +USES+= php:web +USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap \ + mbstring pcre session simplexml snmp sockets xml xmlreader \ + xmlwriter + PATCHDIR= +NO_ARCH= yes +NO_BUILD= yes PLIST= ${PKGDIR}/pkg-plist.frontend -USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap mbstring \ - pcre session simplexml snmp sockets xml xmlreader xmlwriter -USES+= php:web - -OPTIONS_DEFINE= MYSQLI PGSQL ORACLE +OPTIONS_DEFINE= MYSQLI ORACLE PGSQL OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQLI_USE= PHP=mysqli - -PGSQL_USE= PHP=pgsql - +MYSQLI_USE= PHP=mysqli ORACLE_CONFIGURE_WITH= oracle +PGSQL_USE= PHP=pgsql do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC}/ui && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix5-java/Makefile b/net-mgmt/zabbix5-java/Makefile index 9ae9fa3573e4..d3f09bd459c6 100644 --- a/net-mgmt/zabbix5-java/Makefile +++ b/net-mgmt/zabbix5-java/Makefile @@ -1,12 +1,13 @@ PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -java MASTERDIR= ${.CURDIR}/../zabbix5-server -PLIST= ${PKGDIR}/pkg-plist.java - -OPTIONS_DEFINE= IPV6 USE_JAVA= yes +PLIST= ${PKGDIR}/pkg-plist.java + +OPTIONS_DEFINE= IPV6 + .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix5-proxy/Makefile b/net-mgmt/zabbix5-proxy/Makefile index 55280075f558..71ad3c8682f1 100644 --- a/net-mgmt/zabbix5-proxy/Makefile +++ b/net-mgmt/zabbix5-proxy/Makefile @@ -1,11 +1,11 @@ # Created by: Pakhom Golynga PORTNAME= zabbix5 CATEGORIES= net-mgmt PKGNAMESUFFIX= -proxy MASTERDIR= ${.CURDIR}/../zabbix5-server -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE +OPTIONS_SINGLE_DB= MYSQL ORACLE PGSQL SQLITE .include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile index f7cad872caa3..e7a610a53858 100644 --- a/net-mgmt/zabbix5-server/Makefile +++ b/net-mgmt/zabbix5-server/Makefile @@ -1,216 +1,222 @@ # Created by: Pakhom Golynga PORTNAME= zabbix5 -DISTVERSION= 5.0.14 +DISTVERSION= 5.0.15 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server DISTNAME= zabbix-${DISTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS_INSTALL= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" PLIST_FILES+= bin/zabbix_proxy_js .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" PLIST_FILES+= bin/zabbix_js .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} DISTVERSION=${DISTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks UNIXODBC_DESC= Support for database checks via ODBC LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB SSL OPTIONS_SINGLE_DB?= MYSQL PGSQL ORACLE OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= compiler:c11 mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .elif ${ZABBIX_BUILD} == "agent" OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" CURL_DESC= Support for web monitoring CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo LIBXML2_CONFIGURE_WITH= libxml2=${LOCALBASE} LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ BROKEN_SSL_REASON="PSK is not provided by LibreSSL" GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/usr/local/etc#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ ${WRKSRC}/conf/zabbix_*.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c \ ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.pid#/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server.conf \ ${WRKSRC}/src/zabbix_server/server.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_server.log#/var/log/zabbix/zabbix_server.log#g' \ + ${WRKSRC}/conf/zabbix_server.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.pid#/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_proxy.log#/var/log/zabbix/zabbix_proxy.log#g' \ + ${WRKSRC}/conf/zabbix_proxy.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.pid#/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd.conf \ ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c + @${REINPLACE_CMD} -e 's#/tmp/zabbix_agentd.log#/var/log/zabbix/zabbix_agentd.log#g' \ + ${WRKSRC}/conf/zabbix_agentd.conf .endif .if ${ZABBIX_BUILD} == "java" @${REINPLACE_CMD} -e 's#/tmp/zabbix_java.pid#/var/run/zabbix/zabbix_java.pid#g' \ ${WRKSRC}/src/zabbix_java/settings.sh .endif .if ${ZABBIX_BUILD} != "agent" . for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} \ -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ ${WRKSRC}/database/${d}/data.sql . endfor .endif @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + pre-configure: @echo "ac_cv_env_PKG_CONFIG_set=${LOCALBASE}/bin/pkgconf" > ${WRKSRC}/config.cache post-install: .if ${ZABBIX_BUILD} == "java" ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample @${MKDIR} ${STAGEDIR}/var/run/zabbix .endif .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database @${RM} ${WRKSRC}/database/*/Makefile* (cd ${WRKSRC}/database/ && \ ${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample .endif .if ${ZABBIX_BUILD} == "agent" ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample .endif .if ${ZABBIX_BUILD} == "proxy" ${MV} ${STAGEDIR}${LOCALBASE}/bin/zabbix_js \ ${STAGEDIR}${LOCALBASE}/bin/zabbix_proxy_js .endif .else # frontend .include .endif .include diff --git a/net-mgmt/zabbix5-server/distinfo b/net-mgmt/zabbix5-server/distinfo index 3c1a4733d5be..bc6466de2be6 100644 --- a/net-mgmt/zabbix5-server/distinfo +++ b/net-mgmt/zabbix5-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626699270 -SHA256 (zabbix-5.0.14.tar.gz) = 156c6ac9cc3307c24427dcf42f421a0dd6af37ff612f3e2cfff54e0cf7b0f507 -SIZE (zabbix-5.0.14.tar.gz) = 21159722 +TIMESTAMP = 1630853536 +SHA256 (zabbix-5.0.15.tar.gz) = 9c179ea139c62497a27928af8242255fc32be7eae8deac2a4e7cc8f67be43de1 +SIZE (zabbix-5.0.15.tar.gz) = 21297290 diff --git a/net-mgmt/zabbix5-server/files/pkg-message.in b/net-mgmt/zabbix5-server/files/pkg-message.in index 4aa7ff2936bd..e6b7ab4c8be2 100644 --- a/net-mgmt/zabbix5-server/files/pkg-message.in +++ b/net-mgmt/zabbix5-server/files/pkg-message.in @@ -1,44 +1,47 @@ [ { type: install message: <