[pkgsrc/trunk]: pkgsrc/sysutils sysutils/zabbix*: Update to 4.0.21

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/264b9da00c11
branches:  trunk
changeset: 434664:264b9da00c11
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Jun 20 12:43:46 2020 +0000

description:
sysutils/zabbix*: Update to 4.0.21

As provided on pkgsrc-users by Yuuki Enomoto.

Packaging changes: Update MASTER_SITE.

Upstream lacks NEWS and the page that their NEWS file points to does
not contain NEWS.

A quick glance over upstream, and the fact that this is a series of
micro updates, leads one to guess that this update basically contains
minor improvements and bugfixes.

diffstat:

 sysutils/zabbix-frontend/Makefile                               |   6 +-
 sysutils/zabbix-frontend/PLIST                                  |  48 +++++----
 sysutils/zabbix/Makefile                                        |   4 +-
 sysutils/zabbix/Makefile.common                                 |   6 +-
 sysutils/zabbix/distinfo                                        |  11 +-
 sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c |  17 ---
 6 files changed, 39 insertions(+), 53 deletions(-)

diffs (237 lines):

diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix-frontend/Makefile
--- a/sysutils/zabbix-frontend/Makefile Sat Jun 20 10:43:43 2020 +0000
+++ b/sysutils/zabbix-frontend/Makefile Sat Jun 20 12:43:46 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2019/12/09 14:20:56 taca Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/20 12:43:46 gdt Exp $
 
-PKGREVISION= 1
+#PKGREVISION= 1
 .include "../../sysutils/zabbix/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-frontend-/}
@@ -12,7 +12,7 @@
 do-configure:
        ${DO_NADA}
 
-REPLACE_SH+=   ${WRKSRC}/frontends/php/locale/*.sh
+REPLACE_SH+=   frontends/php/locale/*.sh
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix-frontend/PLIST
--- a/sysutils/zabbix-frontend/PLIST    Sat Jun 20 10:43:43 2020 +0000
+++ b/sysutils/zabbix-frontend/PLIST    Sat Jun 20 12:43:46 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/06/24 12:05:36 he Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/06/20 12:43:46 gdt Exp $
 share/zabbix/php/actionconf.php
 share/zabbix/php/adm.gui.php
 share/zabbix/php/adm.housekeeper.php
@@ -30,6 +30,7 @@
 share/zabbix/php/app/controllers/CControllerDashboardWidgetEdit.php
 share/zabbix/php/app/controllers/CControllerDashboardWidgetRfRate.php
 share/zabbix/php/app/controllers/CControllerDiscoveryView.php
+share/zabbix/php/app/controllers/CControllerExportXml.php
 share/zabbix/php/app/controllers/CControllerFavouriteCreate.php
 share/zabbix/php/app/controllers/CControllerFavouriteDelete.php
 share/zabbix/php/app/controllers/CControllerMapView.php
@@ -41,6 +42,9 @@
 share/zabbix/php/app/controllers/CControllerMediatypeList.php
 share/zabbix/php/app/controllers/CControllerMediatypeUpdate.php
 share/zabbix/php/app/controllers/CControllerMenuPopup.php
+share/zabbix/php/app/controllers/CControllerNotificationsGet.php
+share/zabbix/php/app/controllers/CControllerNotificationsMute.php
+share/zabbix/php/app/controllers/CControllerNotificationsRead.php
 share/zabbix/php/app/controllers/CControllerPopupGeneric.php
 share/zabbix/php/app/controllers/CControllerPopupHttpStep.php
 share/zabbix/php/app/controllers/CControllerPopupMedia.php
@@ -114,6 +118,7 @@
 share/zabbix/php/app/views/layout.json.php
 share/zabbix/php/app/views/layout.warning.php
 share/zabbix/php/app/views/layout.widget.php
+share/zabbix/php/app/views/layout.xml.php
 share/zabbix/php/app/views/monitoring.acknowledge.edit.js.php
 share/zabbix/php/app/views/monitoring.acknowledge.edit.php
 share/zabbix/php/app/views/monitoring.dashboard.breadcrumbs.php
@@ -146,7 +151,6 @@
 share/zabbix/php/app/views/monitoring.widget.url.view.php
 share/zabbix/php/app/views/monitoring.widget.web.view.php
 share/zabbix/php/app/views/popup.generic.php
-share/zabbix/php/app/views/popup.httpstep.js.php
 share/zabbix/php/app/views/popup.httpstep.php
 share/zabbix/php/app/views/popup.media.js.php
 share/zabbix/php/app/views/popup.media.php
@@ -174,13 +178,13 @@
 share/zabbix/php/assets/styles/dark-theme.css
 share/zabbix/php/assets/styles/hc-dark.css
 share/zabbix/php/assets/styles/hc-light.css
-share/zabbix/php/audio/alarm_average.wav
-share/zabbix/php/audio/alarm_disaster.wav
-share/zabbix/php/audio/alarm_high.wav
-share/zabbix/php/audio/alarm_information.wav
-share/zabbix/php/audio/alarm_ok.wav
-share/zabbix/php/audio/alarm_warning.wav
-share/zabbix/php/audio/no_sound.wav
+share/zabbix/php/audio/alarm_average.mp3
+share/zabbix/php/audio/alarm_disaster.mp3
+share/zabbix/php/audio/alarm_high.mp3
+share/zabbix/php/audio/alarm_information.mp3
+share/zabbix/php/audio/alarm_ok.mp3
+share/zabbix/php/audio/alarm_warning.mp3
+share/zabbix/php/audio/no_sound.mp3
 share/zabbix/php/auditacts.php
 share/zabbix/php/auditlogs.php
 share/zabbix/php/browserwarning.php
@@ -212,14 +216,6 @@
 share/zabbix/php/httpconf.php
 share/zabbix/php/httpdetails.php
 share/zabbix/php/image.php
-share/zabbix/php/images/general/arrow_down.png
-share/zabbix/php/images/general/arrow_up.png
-share/zabbix/php/images/general/no_icon.png
-share/zabbix/php/images/general/tr_space.gif
-share/zabbix/php/images/general/tr_top_bottom.gif
-share/zabbix/php/images/general/tr_top_right.gif
-share/zabbix/php/images/general/tr_top_right_bottom.gif
-share/zabbix/php/images/general/tree/zero.gif
 share/zabbix/php/imgstore.php
 share/zabbix/php/include/.htaccess
 share/zabbix/php/include/actions.inc.php
@@ -318,6 +314,7 @@
 share/zabbix/php/include/classes/debug/CProfiler.php
 share/zabbix/php/include/classes/export/CConfigurationExport.php
 share/zabbix/php/include/classes/export/CConfigurationExportBuilder.php
+share/zabbix/php/include/classes/export/CConfigurationExportException.php
 share/zabbix/php/include/classes/export/writers/CExportWriter.php
 share/zabbix/php/include/classes/export/writers/CExportWriterFactory.php
 share/zabbix/php/include/classes/export/writers/CJsonExportWriter.php
@@ -505,7 +502,7 @@
 share/zabbix/php/include/classes/parsers/CUserMacroParser.php
 share/zabbix/php/include/classes/parsers/CValidationRule.php
 share/zabbix/php/include/classes/parsers/results/CParserResult.php
-share/zabbix/php/include/classes/parsers/results/CTriggerExpressionParserResult.php
+share/zabbix/php/include/classes/parsers/results/CTriggerExprParserResult.php
 share/zabbix/php/include/classes/regexp/CGlobalRegexp.php
 share/zabbix/php/include/classes/routing/CUrl.php
 share/zabbix/php/include/classes/routing/CUrlFactory.php
@@ -680,7 +677,7 @@
 share/zabbix/php/include/views/administration.general.regularexpressions.edit.php
 share/zabbix/php/include/views/administration.general.regularexpressions.list.php
 share/zabbix/php/include/views/administration.general.trigger.options.edit.php
-share/zabbix/php/include/views/administration.general.triggerSeverity.edit.php
+share/zabbix/php/include/views/administration.general.trigseverity.edit.php
 share/zabbix/php/include/views/administration.general.valuemapping.edit.php
 share/zabbix/php/include/views/administration.general.valuemapping.list.php
 share/zabbix/php/include/views/administration.general.workingtime.edit.php
@@ -742,7 +739,7 @@
 share/zabbix/php/include/views/js/administration.general.iconmap.js.php
 share/zabbix/php/include/views/js/administration.general.macros.edit.js.php
 share/zabbix/php/include/views/js/administration.general.trigger.options.js.php
-share/zabbix/php/include/views/js/administration.general.triggerSeverity.js.php
+share/zabbix/php/include/views/js/administration.general.trigseverity.js.php
 share/zabbix/php/include/views/js/administration.general.valuemapping.edit.js.php
 share/zabbix/php/include/views/js/administration.users.edit.js.php
 share/zabbix/php/include/views/js/common.filter.trigger.js.php
@@ -798,12 +795,12 @@
 share/zabbix/php/js/browsers.js
 share/zabbix/php/js/chkbxrange.js
 share/zabbix/php/js/class.bbcode.js
+share/zabbix/php/js/class.browsertab.js
 share/zabbix/php/js/class.calendar.js
 share/zabbix/php/js/class.cclock.js
 share/zabbix/php/js/class.cdate.js
 share/zabbix/php/js/class.cdebug.js
 share/zabbix/php/js/class.cmap.js
-share/zabbix/php/js/class.cmessages.js
 share/zabbix/php/js/class.cnavtree.js
 share/zabbix/php/js/class.cookie.js
 share/zabbix/php/js/class.coverride.js
@@ -815,8 +812,15 @@
 share/zabbix/php/js/class.curl.js
 share/zabbix/php/js/class.cverticalaccordion.js
 share/zabbix/php/js/class.cviewswitcher.js
-share/zabbix/php/js/class.mapWidget.js
+share/zabbix/php/js/class.localstorage.js
+share/zabbix/php/js/class.mapwidget.js
+share/zabbix/php/js/class.notification.collection.js
+share/zabbix/php/js/class.notification.js
+share/zabbix/php/js/class.notifications.audio.js
+share/zabbix/php/js/class.notifications.js
+share/zabbix/php/js/class.overlaycollection.js
 share/zabbix/php/js/class.pmaster.js
+share/zabbix/php/js/class.promise.js
 share/zabbix/php/js/class.rpc.js
 share/zabbix/php/js/colorpicker.js
 share/zabbix/php/js/common.js
diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix/Makefile
--- a/sysutils/zabbix/Makefile  Sat Jun 20 10:43:43 2020 +0000
+++ b/sysutils/zabbix/Makefile  Sat Jun 20 12:43:46 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2020/06/02 08:24:49 adam Exp $
+# $NetBSD: Makefile,v 1.37 2020/06/20 12:43:46 gdt Exp $
 
-PKGREVISION= 11
+#PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=       Enterprise-class Monitoring Solution for Everyone
diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix/Makefile.common
--- a/sysutils/zabbix/Makefile.common   Sat Jun 20 10:43:43 2020 +0000
+++ b/sysutils/zabbix/Makefile.common   Sat Jun 20 12:43:46 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2019/06/20 12:03:28 he Exp $
+# $NetBSD: Makefile.common,v 1.16 2020/06/20 12:43:46 gdt Exp $
 # used by sysutils/zabbix/Makefile
 # used by sysutils/zabbix-frontend/Makefile
 
-DISTNAME=      zabbix-4.0.9
+DISTNAME=      zabbix-4.0.21
 CATEGORIES=    sysutils
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zabbix/}
+MASTER_SITES=  https://cdn.zabbix.com/zabbix/sources/stable/4.0/
 
 MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.zabbix.com/
diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix/distinfo
--- a/sysutils/zabbix/distinfo  Sat Jun 20 10:43:43 2020 +0000
+++ b/sysutils/zabbix/distinfo  Sat Jun 20 12:43:46 2020 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.18 2019/11/16 10:57:22 he Exp $
+$NetBSD: distinfo,v 1.19 2020/06/20 12:43:46 gdt Exp $
 
-SHA1 (zabbix-4.0.9.tar.gz) = 865eb4d9cbb7c53b942c4a538314ebf9d8400099
-RMD160 (zabbix-4.0.9.tar.gz) = c586e0b55ed8d6569889df7494379266dd67ef31
-SHA512 (zabbix-4.0.9.tar.gz) = 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
-Size (zabbix-4.0.9.tar.gz) = 17118478 bytes
+SHA1 (zabbix-4.0.21.tar.gz) = df8c54ccff94f7804470e58c363ef743976f2f57
+RMD160 (zabbix-4.0.21.tar.gz) = 7cbcd33118d4f9893bd639aa55abd80c1a0fedaa
+SHA512 (zabbix-4.0.21.tar.gz) = d5eac5474dcad005466200868fa4fab86abdd41eb9cf49bf6e7f52ae1e9fab82757d5a96f373154edd275bfa22461a8f7f2bbf70b419b2918e8dcf872818aa76
+Size (zabbix-4.0.21.tar.gz) = 17300931 bytes
 SHA1 (patch-frontends_php_locale_add__new__language.sh) = 71be94363ee58490d2ee3ef4bc6b800cfc99e90a
 SHA1 (patch-frontends_php_locale_make__mo.sh) = c44c8996ffc5c1fa31eebaa766edb430e03004de
-SHA1 (patch-src_libs_zbxsysinfo_netbsd_proc.c) = fde4e78373d7f10e015dae8a15bab74633560093
 SHA1 (patch-src_zabbix__agent_Makefile.in) = 55149e2969d0e6e54c537750ca1bde11c9b690d7
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 2e7dbe6e8554bbe2c1cb1074a308661ae44bb977
 SHA1 (patch-src_zabbix__server_Makefile.in) = bfcb02e8450df163a038adbae83a7e17fda0a9a9
diff -r e112aa15268c -r 264b9da00c11 sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c
--- a/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c   Sat Jun 20 10:43:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_libs_zbxsysinfo_netbsd_proc.c,v 1.1 2019/11/16 10:57:22 he Exp $
-
-Use P_ZOMBIE() macro instead of testing against LSDEAD, which is
-gone in later versions.
-Thanks to Yuuki Enomoto for the patch.
-
---- src/libs/zbxsysinfo/netbsd/proc.c.orig     2019-06-07 07:18:53.000000000 +0000
-+++ src/libs/zbxsysinfo/netbsd/proc.c
-@@ -298,7 +298,7 @@ int        PROC_NUM(AGENT_REQUEST *request, AGE
-                                               stat_ok = 1;
-                                       break;
-                               case ZBX_PROC_STAT_ZOMB:
--                                      if (SZOMB == pproc->p_stat || LSDEAD == pproc->p_stat)
-+                                      if (P_ZOMBIE(pproc))
-                                               stat_ok = 1;
-                                       break;
-                               case ZBX_PROC_STAT_DISK: