From 7f910f8c6efc9333787f487ad5ea13a022671ab2 Mon Sep 17 00:00:00 2001 From: Juraj Lutter Date: Tue, 26 Jan 2021 17:54:33 +0000 Subject: [PATCH] net-mgmt/zabbix5-server: Update to 5.0.8 Changelog: https://www.zabbix.com/rn/rn5.0.8 And while here, also change PORTVERSION to DISTVERSION where apropriate. PR: 253017 Submitted by: pg@pakhom.spb.ru (maintainer) Reviewed by: osa (mentor) Approved by: osa (mentor) Differential Revision: https://reviews.freebsd.org/D28352 --- net-mgmt/zabbix5-server/Makefile | 8 ++++---- net-mgmt/zabbix5-server/distinfo | 6 +++--- net-mgmt/zabbix5-server/pkg-plist.frontend | 19 +++++++++++++++---- net-mgmt/zabbix5-server/pkg-plist.java | 2 +- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/net-mgmt/zabbix5-server/Makefile b/net-mgmt/zabbix5-server/Makefile index 0c556747a44b..da704c3f5f09 100644 --- a/net-mgmt/zabbix5-server/Makefile +++ b/net-mgmt/zabbix5-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= zabbix5 -PORTVERSION= 5.0.6 +DISTVERSION= 5.0.8 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 @@ -49,7 +49,7 @@ PLIST_FILES+= bin/zabbix_js PLIST_SUB+= SERVER="@comment " .endif -PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} +PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} DISTVERSION=${DISTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} MAKE_ARGS+= ARCH=freebsd diff --git a/net-mgmt/zabbix5-server/distinfo b/net-mgmt/zabbix5-server/distinfo index 2c9e45bc58d2..144db29b15d8 100644 --- a/net-mgmt/zabbix5-server/distinfo +++ b/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 = 1611666208 +SHA256 (zabbix-5.0.8.tar.gz) = a6a61d2aec82210506f02e4d51594d28f2cb8d40e061fe487460334c6ba0e7e3 +SIZE (zabbix-5.0.8.tar.gz) = 19474050 diff --git a/net-mgmt/zabbix5-server/pkg-plist.frontend b/net-mgmt/zabbix5-server/pkg-plist.frontend index 2745b0e3fc4f..60336e4d4270 100644 --- a/net-mgmt/zabbix5-server/pkg-plist.frontend +++ b/net-mgmt/zabbix5-server/pkg-plist.frontend @@ -231,6 +231,8 @@ %%WWWDIR%%/app/views/dashboard.properties.edit.php %%WWWDIR%%/app/views/dashboard.sharing.edit.php %%WWWDIR%%/app/views/hostmacros.list.php +%%WWWDIR%%/app/views/js/administration.image.list.js.php +%%WWWDIR%%/app/views/js/administration.user.list.js.php %%WWWDIR%%/app/views/js/administration.authentication.edit.js.php %%WWWDIR%%/app/views/js/administration.autoreg.edit.js.php %%WWWDIR%%/app/views/js/administration.housekeeping.edit.js.php @@ -253,6 +255,7 @@ %%WWWDIR%%/app/views/js/monitoring.host.view.js.php %%WWWDIR%%/app/views/js/monitoring.latest.view.js.php %%WWWDIR%%/app/views/js/monitoring.problem.view.js.php +%%WWWDIR%%/app/views/js/monitoring.map.view.js.php %%WWWDIR%%/app/views/js/popup.acknowledge.edit.js.php %%WWWDIR%%/app/views/js/popup.discovery.check.js.php %%WWWDIR%%/app/views/js/popup.itemtestedit.view.js.php @@ -261,7 +264,9 @@ %%WWWDIR%%/app/views/js/popup.mediatype.message.js.php %%WWWDIR%%/app/views/js/popup.mediatypetest.edit.js.php %%WWWDIR%%/app/views/js/popup.triggerwizard.js.php +%%WWWDIR%%/app/views/js/popup.triggerexpr.js.php %%WWWDIR%%/app/views/js/reports.auditlog.list.js.php +%%WWWDIR%%/app/views/js/report.services.js.php %%WWWDIR%%/app/views/layout.csv.php %%WWWDIR%%/app/views/layout.htmlpage.php %%WWWDIR%%/app/views/layout.javascript.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 @@ -536,6 +539,7 @@ %%WWWDIR%%/include/classes/html/CLabel.php %%WWWDIR%%/include/classes/html/CLink.php %%WWWDIR%%/include/classes/html/CLinkAction.php +%%WWWDIR%%/include/classes/html/CListBoxItem.php %%WWWDIR%%/include/classes/html/CList.php %%WWWDIR%%/include/classes/html/CListBox.php %%WWWDIR%%/include/classes/html/CListItem.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 @@ -790,7 +793,8 @@ %%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/CWidgetFieldSelect.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 @@ -955,6 +959,9 @@ %%WWWDIR%%/include/views/js/monitoring.slides.js.php %%WWWDIR%%/include/views/js/monitoring.sysmap.edit.js.php %%WWWDIR%%/include/views/js/monitoring.sysmaps.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/monitoring.history.php %%WWWDIR%%/include/views/monitoring.hostscreen.php %%WWWDIR%%/include/views/monitoring.overview.items.php @@ -1031,6 +1038,10 @@ %%WWWDIR%%/js/pages/popup.condition.common.js %%WWWDIR%%/js/pages/popup.operation.common.js %%WWWDIR%%/js/pages/setup.js +%%WWWDIR%%/js/pages/monitoring.overview.js +%%WWWDIR%%/js/pages/report2.js +%%WWWDIR%%/js/pages/report4.js +%%WWWDIR%%/js/pages/srv_status.js %%WWWDIR%%/js/servercheck.js %%WWWDIR%%/js/textareaflexible.js %%WWWDIR%%/js/vector/class.svg.canvas.js diff --git a/net-mgmt/zabbix5-server/pkg-plist.java b/net-mgmt/zabbix5-server/pkg-plist.java index 4b0bd8f968de..f1edd654411e 100644 --- a/net-mgmt/zabbix5-server/pkg-plist.java +++ b/net-mgmt/zabbix5-server/pkg-plist.java @@ -7,5 +7,5 @@ sbin/zabbix_java/lib/slf4j-api-1.6.1.jar 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