Index: net-mgmt/zabbix5-server/Makefile =================================================================== --- net-mgmt/zabbix5-server/Makefile +++ net-mgmt/zabbix5-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= zabbix5 -PORTVERSION= 5.0.6 +DISTVERSION= 5.0.7 PORTREVISION?= 0 CATEGORIES= net-mgmt -MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${PORTVERSION:R}/ +MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server -DISTNAME= zabbix-${PORTVERSION} +DISTNAME= zabbix-${DISTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS @@ -17,20 +17,22 @@ LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS_INSTALL= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-46-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix[0-46-9]${PKGNAMESUFFIX} \ + zabbix[0-9][0-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} +CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache \ + --with-libevent=${LOCALBASE} +LIB_DEPENDS+= libevent.so:devel/libevent +USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else -USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d +USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif -USES= pkgconfig iconv +USES= iconv pkgconfig USERS= zabbix GROUPS= zabbix @@ -49,14 +51,15 @@ PLIST_SUB+= SERVER="@comment " .endif -PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} +PLIST_SUB+= DISTVERSION=${DISTVERSION} \ + ZABBIX_BUILD=${ZABBIX_BUILD} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} -MAKE_ARGS+= ARCH=freebsd -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ +MAKE_ARGS+= ARCH=freebsd +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --datadir=${ETCDIR} \ + --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ - --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" @@ -68,22 +71,22 @@ CONFIGURE_ARGS+= --with-net-snmp -OPTIONS_DEFINE= IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC +OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SSH UNIXODBC -OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL +OPTIONS_DEFAULT= CURL FPING MYSQL OPENSSL UNIXODBC 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) +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 +OPTIONS_SINGLE_DB?= MYSQL ORACLE PGSQL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= compiler:c11 mysql @@ -107,11 +110,11 @@ SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 -UNIXODBC_CONFIGURE_WITH=unixodbc -UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC +UNIXODBC_CONFIGURE_WITH= unixodbc +UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .elif ${ZABBIX_BUILD} == "agent" -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= GNUTLS OPENSSL .endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java" CURL_DESC= Support for web monitoring Index: net-mgmt/zabbix5-server/distinfo =================================================================== --- net-mgmt/zabbix5-server/distinfo +++ net-mgmt/zabbix5-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606981124 -SHA256 (zabbix-5.0.6.tar.gz) = 53c55ae9a0898b7e523712db0fe2daf00d88d6df7188ad14e8ea07d8b3b2cdc8 -SIZE (zabbix-5.0.6.tar.gz) = 19359566 +TIMESTAMP = 1611353161 +SHA256 (zabbix-5.0.7.tar.gz) = d762f8a9aa9e8717d2e85d2a82d27316ea5c2b214eb00aff41b6e9b06107916a +SIZE (zabbix-5.0.7.tar.gz) = 19382483 Index: net-mgmt/zabbix5-server/pkg-plist.frontend =================================================================== --- net-mgmt/zabbix5-server/pkg-plist.frontend +++ net-mgmt/zabbix5-server/pkg-plist.frontend @@ -1,13 +1,13 @@ %%WWWDIR%%/actionconf.php %%WWWDIR%%/api_jsonrpc.php %%WWWDIR%%/app/.htaccess +%%WWWDIR%%/app/controllers/CControllerActionOperationGet.php +%%WWWDIR%%/app/controllers/CControllerActionOperationValidate.php %%WWWDIR%%/app/controllers/CControllerAuditLogList.php %%WWWDIR%%/app/controllers/CControllerAuthenticationEdit.php %%WWWDIR%%/app/controllers/CControllerAuthenticationUpdate.php %%WWWDIR%%/app/controllers/CControllerAutoregEdit.php %%WWWDIR%%/app/controllers/CControllerAutoregUpdate.php -%%WWWDIR%%/app/controllers/CControllerActionOperationGet.php -%%WWWDIR%%/app/controllers/CControllerActionOperationValidate.php %%WWWDIR%%/app/controllers/CControllerCharts.php %%WWWDIR%%/app/controllers/CControllerChartsView.php %%WWWDIR%%/app/controllers/CControllerChartsViewJson.php @@ -184,7 +184,6 @@ %%WWWDIR%%/app/partials/dataoverview.table.top.php %%WWWDIR%%/app/partials/hostmacros.inherited.list.html.php %%WWWDIR%%/app/partials/hostmacros.list.html.php -%%WWWDIR%%/app/partials/popup.operations.php %%WWWDIR%%/app/partials/js/common.filter.trigger.js.php %%WWWDIR%%/app/partials/js/configuration.tags.tab.js.php %%WWWDIR%%/app/partials/js/massupdate.macros.tab.js.php @@ -195,6 +194,7 @@ %%WWWDIR%%/app/partials/monitoring.dashboard.breadcrumbs.php %%WWWDIR%%/app/partials/monitoring.host.view.html.php %%WWWDIR%%/app/partials/monitoring.latest.view.html.php +%%WWWDIR%%/app/partials/popup.operations.php %%WWWDIR%%/app/partials/trigoverview.table.left.php %%WWWDIR%%/app/partials/trigoverview.table.top.php %%WWWDIR%%/app/views/administration.authentication.edit.php @@ -236,6 +236,7 @@ %%WWWDIR%%/app/views/js/administration.housekeeping.edit.js.php %%WWWDIR%%/app/views/js/administration.iconmap.edit.js.php %%WWWDIR%%/app/views/js/administration.image.edit.js.php +%%WWWDIR%%/app/views/js/administration.image.list.js.php %%WWWDIR%%/app/views/js/administration.macros.edit.js.php %%WWWDIR%%/app/views/js/administration.mediatype.edit.js.php %%WWWDIR%%/app/views/js/administration.proxy.edit.js.php @@ -245,6 +246,7 @@ %%WWWDIR%%/app/views/js/administration.trigseverity.edit.js.php %%WWWDIR%%/app/views/js/administration.user.edit.common.js.php %%WWWDIR%%/app/views/js/administration.user.edit.js.php +%%WWWDIR%%/app/views/js/administration.user.list.js.php %%WWWDIR%%/app/views/js/administration.usergroup.edit.js.php %%WWWDIR%%/app/views/js/administration.userprofile.edit.js.php %%WWWDIR%%/app/views/js/administration.valuemap.edit.js.php @@ -252,6 +254,7 @@ %%WWWDIR%%/app/views/js/monitoring.dashboard.view.js.php %%WWWDIR%%/app/views/js/monitoring.host.view.js.php %%WWWDIR%%/app/views/js/monitoring.latest.view.js.php +%%WWWDIR%%/app/views/js/monitoring.map.view.js.php %%WWWDIR%%/app/views/js/monitoring.problem.view.js.php %%WWWDIR%%/app/views/js/popup.acknowledge.edit.js.php %%WWWDIR%%/app/views/js/popup.discovery.check.js.php @@ -260,7 +263,9 @@ %%WWWDIR%%/app/views/js/popup.media.js.php %%WWWDIR%%/app/views/js/popup.mediatype.message.js.php %%WWWDIR%%/app/views/js/popup.mediatypetest.edit.js.php +%%WWWDIR%%/app/views/js/popup.triggerexpr.js.php %%WWWDIR%%/app/views/js/popup.triggerwizard.js.php +%%WWWDIR%%/app/views/js/report.services.js.php %%WWWDIR%%/app/views/js/reports.auditlog.list.js.php %%WWWDIR%%/app/views/layout.csv.php %%WWWDIR%%/app/views/layout.htmlpage.php @@ -517,8 +522,6 @@ %%WWWDIR%%/include/classes/html/CColHeader.php %%WWWDIR%%/include/classes/html/CCollapsibleUiWidget.php %%WWWDIR%%/include/classes/html/CColor.php -%%WWWDIR%%/include/classes/html/CComboBox.php -%%WWWDIR%%/include/classes/html/CComboItem.php %%WWWDIR%%/include/classes/html/CDashboardWidgetMap.php %%WWWDIR%%/include/classes/html/CDateSelector.php %%WWWDIR%%/include/classes/html/CDiv.php @@ -538,6 +541,7 @@ %%WWWDIR%%/include/classes/html/CLinkAction.php %%WWWDIR%%/include/classes/html/CList.php %%WWWDIR%%/include/classes/html/CListBox.php +%%WWWDIR%%/include/classes/html/CListBoxItem.php %%WWWDIR%%/include/classes/html/CListItem.php %%WWWDIR%%/include/classes/html/CMacroValue.php %%WWWDIR%%/include/classes/html/CMenu.php @@ -766,7 +770,6 @@ %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldApplication.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBox.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldCheckBoxList.php -%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldComboBox.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldDatePicker.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldGraphOverride.php @@ -785,12 +788,13 @@ %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRadioButtonList.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldRangeControl.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldReference.php +%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelect.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelectResource.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSeverities.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTags.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldTextBox.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldUrl.php -%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetListComboBox.php +%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php %%WWWDIR%%/include/classes/widgets/forms/CWidgetForm.php %%WWWDIR%%/include/classes/widgets/forms/CWidgetFormActionLog.php %%WWWDIR%%/include/classes/widgets/forms/CWidgetFormClock.php @@ -949,6 +953,9 @@ %%WWWDIR%%/include/views/js/editabletable.js.php %%WWWDIR%%/include/views/js/item.preprocessing.js.php %%WWWDIR%%/include/views/js/itemtest.js.php +%%WWWDIR%%/include/views/js/monitoring.history.js.php +%%WWWDIR%%/include/views/js/monitoring.hostscreen.js.php +%%WWWDIR%%/include/views/js/monitoring.screen.constructor.edit.js.php %%WWWDIR%%/include/views/js/monitoring.screen.edit.js.php %%WWWDIR%%/include/views/js/monitoring.screen.js.php %%WWWDIR%%/include/views/js/monitoring.slideconf.edit.js.php @@ -1028,9 +1035,13 @@ %%WWWDIR%%/js/multilineinput.js %%WWWDIR%%/js/multiselect.js %%WWWDIR%%/js/pages/items.js +%%WWWDIR%%/js/pages/monitoring.overview.js %%WWWDIR%%/js/pages/popup.condition.common.js %%WWWDIR%%/js/pages/popup.operation.common.js +%%WWWDIR%%/js/pages/report2.js +%%WWWDIR%%/js/pages/report4.js %%WWWDIR%%/js/pages/setup.js +%%WWWDIR%%/js/pages/srv_status.js %%WWWDIR%%/js/servercheck.js %%WWWDIR%%/js/textareaflexible.js %%WWWDIR%%/js/vector/class.svg.canvas.js Index: net-mgmt/zabbix5-server/pkg-plist.java =================================================================== --- net-mgmt/zabbix5-server/pkg-plist.java +++ net-mgmt/zabbix5-server/pkg-plist.java @@ -7,5 +7,5 @@ sbin/zabbix_java/lib/android-json-4.3_r3.1.jar @sample sbin/zabbix_java/settings.sh.sample sbin/zabbix_java/startup.sh -sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar +sbin/zabbix_java/bin/zabbix-java-gateway-%%DISTVERSION%%.jar @dir(zabbix,zabbix,755) /var/run/zabbix