Thank you for your working and feedbacks.
If I want to import Zabbix 4.4 or Zabbix 5.0 LTS to pkgsrc, firstly, I'm
going to work in wip repository.
On Sat, Jun 20, 2020 at 08:48:13AM -0400, Greg Troxel wrote:
> Thanks for sending the update. I have applied it.
>
> (I sort of intend to get around to trying zabbix someday, which is why I
> did the update. I know twice as much about it now than I did before I
> started, but if updating along micro revisions of LTS is trouble, that's
> upstream's fault!
>
>
> A few notes for next time:
>
> Please include a commit message. In a patch, create the file MSG with
> the text that should be included, exactly.
>
> PKGREVISION should end up unset (0), not 1, as there is a version
> increase.
>
> Some of the pkgdir lines may be right, but some are perhaps not.
> There wasn't an explanation in the commit message so I didn't apply
> this.
>
> If you do a bigger update, please consider staging in wip
>
>
> Fair enough to update along stable, separately from the leap to a new
> branch.
>
> It's an interesting question whether zabbix should be on LTS vs regular
> stable. If you think it should stay on LTS, please send me a patech
> adding coment with brief rationale. Arguably that might lead to having
> zabbix being versioned, zabbix40 vs zabbix44, and I don't know if that
> does or doesn't make sense.
>
>
>
>
>
> From: "Greg Troxel" <gdt%netbsd.org@localhost>
> Subject: CVS commit: pkgsrc/sysutils
> To: pkgsrc-changes%NetBSD.org@localhost
> Date: Sat, 20 Jun 2020 12:43:46 +0000 (26 seconds ago)
> Reply-To: gdt%netbsd.org@localhost
>
> Module Name: pkgsrc
> Committed By: gdt
> Date: Sat Jun 20 12:43:46 UTC 2020
>
> Modified Files:
> pkgsrc/sysutils/zabbix: Makefile Makefile.common distinfo
> pkgsrc/sysutils/zabbix-frontend: Makefile PLIST
> Removed Files:
> pkgsrc/sysutils/zabbix/patches: patch-src_libs_zbxsysinfo_netbsd_proc.c
>
> Log Message:
> 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.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/zabbix/Makefile
> cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/zabbix/Makefile.common
> cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/zabbix/distinfo
> cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/zabbix-frontend/Makefile
> cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/zabbix-frontend/PLIST
> cvs rdiff -u -r1.1 -r0 \
> pkgsrc/sysutils/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_proc.c
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> [2. text/x-diff]
> Modified files:
>
> Index: pkgsrc/sysutils/zabbix/Makefile
> diff -u pkgsrc/sysutils/zabbix/Makefile:1.36 pkgsrc/sysutils/zabbix/Makefile:1.37
> --- pkgsrc/sysutils/zabbix/Makefile:1.36 Tue Jun 2 08:24:49 2020
> +++ pkgsrc/sysutils/zabbix/Makefile Sat Jun 20 12:43:46 2020
> @@ -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
>
> Index: pkgsrc/sysutils/zabbix/Makefile.common
> diff -u pkgsrc/sysutils/zabbix/Makefile.common:1.15 pkgsrc/sysutils/zabbix/Makefile.common:1.16
> --- pkgsrc/sysutils/zabbix/Makefile.common:1.15 Thu Jun 20 12:03:28 2019
> +++ pkgsrc/sysutils/zabbix/Makefile.common Sat Jun 20 12:43:46 2020
> @@ -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/
>
> Index: pkgsrc/sysutils/zabbix/distinfo
> diff -u pkgsrc/sysutils/zabbix/distinfo:1.18 pkgsrc/sysutils/zabbix/distinfo:1.19
> --- pkgsrc/sysutils/zabbix/distinfo:1.18 Sat Nov 16 10:57:22 2019
> +++ pkgsrc/sysutils/zabbix/distinfo Sat Jun 20 12:43:46 2020
> @@ -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
>
> Index: pkgsrc/sysutils/zabbix-frontend/Makefile
> diff -u pkgsrc/sysutils/zabbix-frontend/Makefile:1.5 pkgsrc/sysutils/zabbix-frontend/Makefile:1.6
> --- pkgsrc/sysutils/zabbix-frontend/Makefile:1.5 Mon Dec 9 14:20:56 2019
> +++ pkgsrc/sysutils/zabbix-frontend/Makefile Sat Jun 20 12:43:46 2020
> @@ -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 @@ NO_BUILD= yes
> do-configure:
> ${DO_NADA}
>
> -REPLACE_SH+= ${WRKSRC}/frontends/php/locale/*.sh
> +REPLACE_SH+= frontends/php/locale/*.sh
>
> .include "../../mk/bsd.prefs.mk"
>
>
> Index: pkgsrc/sysutils/zabbix-frontend/PLIST
> diff -u pkgsrc/sysutils/zabbix-frontend/PLIST:1.6 pkgsrc/sysutils/zabbix-frontend/PLIST:1.7
> --- pkgsrc/sysutils/zabbix-frontend/PLIST:1.6 Mon Jun 24 12:05:36 2019
> +++ pkgsrc/sysutils/zabbix-frontend/PLIST Sat Jun 20 12:43:46 2020
> @@ -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/CContro
> 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/CContro
> 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.javasc
> 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.wi
> 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/blue-them
> 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/hosts.php
> 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/db/Post
> 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
> 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/administr
> 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/admini
> 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/items.php
> 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.ctree.js
> 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
>
--
Yuuki Enomoto <uki%e-yuuki.org@localhost>
B684 4BF2 9CD4 961F 510A 8121 7B4D FF44 2348 20B8
Attachment:
signature.asc
Description: PGP signature