From 7450b22ce3b59f38905610614493ec448c837ffe Mon Sep 17 00:00:00 2001 From: Juraj Lutter Date: Tue, 26 Jan 2021 17:56:40 +0000 Subject: [PATCH] net-mgmt/zabbix52-server: Update to 5.2.4 Changelog: https://www.zabbix.com/rn/rn5.2.4 And while here, also change PORTVERSION to DISTVERSION where apropriate. PR: 253016 Submitted by: pg@pakhom.spb.ru (maintainer) Reviewed by: osa (mentor) Approved by: osa (mentor) Differential Revision: https://reviews.freebsd.org/D28351 --- net-mgmt/zabbix52-server/Makefile | 8 ++++---- net-mgmt/zabbix52-server/distinfo | 6 +++--- net-mgmt/zabbix52-server/pkg-plist.frontend | 21 ++++++++++++++++----- net-mgmt/zabbix52-server/pkg-plist.java | 2 +- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/net-mgmt/zabbix52-server/Makefile b/net-mgmt/zabbix52-server/Makefile index d325dd8f6124..f0c3ff09ba0c 100644 --- a/net-mgmt/zabbix52-server/Makefile +++ b/net-mgmt/zabbix52-server/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= zabbix52 -PORTVERSION= 5.2.2 +DISTVERSION= 5.2.4 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/^-//}) @@ -51,7 +51,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/zabbix52-server/distinfo b/net-mgmt/zabbix52-server/distinfo index efe63cba375e..bf3e0dbad0cf 100644 --- a/net-mgmt/zabbix52-server/distinfo +++ b/net-mgmt/zabbix52-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606982680 -SHA256 (zabbix-5.2.2.tar.gz) = 0f71a623ae801ba493849204415ceae73be078452be86ea8e5914d9c61e9589b -SIZE (zabbix-5.2.2.tar.gz) = 19745101 +TIMESTAMP = 1611665151 +SHA256 (zabbix-5.2.4.tar.gz) = 84cd7b7992895631071fc85a04b5add068fa101075f1bd2d2a018d02f12e2679 +SIZE (zabbix-5.2.4.tar.gz) = 19916307 diff --git a/net-mgmt/zabbix52-server/pkg-plist.frontend b/net-mgmt/zabbix52-server/pkg-plist.frontend index f23f5a5c2239..fbfe1fc165f9 100644 --- a/net-mgmt/zabbix52-server/pkg-plist.frontend +++ b/net-mgmt/zabbix52-server/pkg-plist.frontend @@ -210,7 +210,6 @@ %%WWWDIR%%/app/partials/layout.htmlpage.footer.php %%WWWDIR%%/app/partials/layout.htmlpage.header.php %%WWWDIR%%/app/partials/massupdate.macros.tab.php -%%WWWDIR%%/app/partials/monitoring.dashboard.breadcrumbs.php %%WWWDIR%%/app/partials/monitoring.host.filter.php %%WWWDIR%%/app/partials/monitoring.host.view.html.php %%WWWDIR%%/app/partials/monitoring.latest.view.html.php @@ -257,6 +256,8 @@ %%WWWDIR%%/app/views/dashboard.properties.edit.php %%WWWDIR%%/app/views/dashboard.share.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.gui.edit.js.php @@ -287,6 +288,8 @@ %%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.triggerexpr.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 @@ -297,6 +300,7 @@ %%WWWDIR%%/app/views/js/popup.tabfilter.edit.js.php %%WWWDIR%%/app/views/js/popup.triggerwizard.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.export.php %%WWWDIR%%/app/views/layout.htmlpage.php @@ -560,6 +564,9 @@ %%WWWDIR%%/include/classes/helpers/CUploadFile.php %%WWWDIR%%/include/classes/helpers/CVaultHelper.php %%WWWDIR%%/include/classes/helpers/CViewHelper.php +%%WWWDIR%%/include/classes/helpers/CDateTimeZoneHelper.php +%%WWWDIR%%/include/classes/html/CBreadcrumbs.php +%%WWWDIR%%/include/classes/html/CListBoxItem.php %%WWWDIR%%/include/classes/html/CActionButtonList.php %%WWWDIR%%/include/classes/html/CButton.php %%WWWDIR%%/include/classes/html/CButtonCancel.php @@ -574,8 +581,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 @@ -832,11 +837,12 @@ %%WWWDIR%%/include/classes/validators/schema/CSchemaValidator.php %%WWWDIR%%/include/classes/widgets/CWidgetConfig.php %%WWWDIR%%/include/classes/widgets/CWidgetHelper.php +%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldSelect.php +%%WWWDIR%%/include/classes/widgets/fields/CWidgetFieldWidgetSelect.php %%WWWDIR%%/include/classes/widgets/fields/CWidgetField.php %%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 @@ -860,7 +866,6 @@ %%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/forms/CWidgetForm.php %%WWWDIR%%/include/classes/widgets/forms/CWidgetFormActionLog.php %%WWWDIR%%/include/classes/widgets/forms/CWidgetFormClock.php @@ -988,6 +993,8 @@ %%WWWDIR%%/include/views/js/common.item.edit.js.php %%WWWDIR%%/include/views/js/common.template.edit.js.php %%WWWDIR%%/include/views/js/conf.import.js.php +%%WWWDIR%%/include/views/js/monitoring.history.js.php +%%WWWDIR%%/include/views/js/monitoring.screen.constructor.edit.js.php %%WWWDIR%%/include/views/js/configuration.action.edit.js.php %%WWWDIR%%/include/views/js/configuration.copy.elements.js.php %%WWWDIR%%/include/views/js/configuration.correlation.edit.js.php @@ -1099,6 +1106,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/zabbix52-server/pkg-plist.java b/net-mgmt/zabbix52-server/pkg-plist.java index 4b0bd8f968de..f1edd654411e 100644 --- a/net-mgmt/zabbix52-server/pkg-plist.java +++ b/net-mgmt/zabbix52-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