git: 6cad1d287bd2 - 2022Q1 - www/grafana8: Update to upstream version 8.3.6

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thomas Zander <riggs_at_FreeBSD.org>
Date: Sat, 26 Feb 2022 14:26:24 UTC
The branch 2022Q1 has been updated by riggs:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6cad1d287bd2d3bdb5d1a0f9688096ee2c08ad11

commit 6cad1d287bd2d3bdb5d1a0f9688096ee2c08ad11
Author:     Boris Korzun <drtr0jan@yandex.ru>
AuthorDate: 2022-02-26 13:10:11 +0000
Commit:     Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2022-02-26 14:02:39 +0000

    www/grafana8: Update to upstream version 8.3.6
    
    PR:             261892
    MFH:            2022Q1
    Security:       CVE-2022-21702
                    CVE-2022-21703
                    CVE-2022-21713
    (cherry picked from commit 83a1ccc5f2868261bdd465fedd9d13e3ada2efdb)
---
 www/grafana8/Makefile         |  6 +++---
 www/grafana8/Makefile.modules |  4 ++--
 www/grafana8/distinfo         | 18 +++++++++---------
 www/grafana8/pkg-plist        | 18 +++++++++++-------
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index 42aa78782fd9..8ee501986505 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.3.4
+DISTVERSION=	8.3.6
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public
 PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}
@@ -22,7 +22,7 @@ USES=		cpe go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		a551d74
+TAG=		bf8766b
 
 GO_TARGET=	./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
@@ -37,7 +37,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
-		GRAFANA_BUILDHASH=1322a38d8e955d3d27e7
+		GRAFANA_BUILDHASH=0e38943fa459e872fe93
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules
index 3a99769edd7a..801bcbf3ad30 100644
--- a/www/grafana8/Makefile.modules
+++ b/www/grafana8/Makefile.modules
@@ -49,7 +49,7 @@ GH_TUPLE=	\
 		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		cue-lang:cue:v0.4.0:cuelang_cue/vendor/cuelang.org/go \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		deepmap:oapi-codegen:v1.6.0:deepmap_oapi_codegen/vendor/github.com/deepmap/oapi-codegen \
+		deepmap:oapi-codegen:v1.8.2:deepmap_oapi_codegen/vendor/github.com/deepmap/oapi-codegen \
 		dennwc:varint:v1.0.0:dennwc_varint/vendor/github.com/dennwc/varint \
 		dgryski:go-rendezvous:9f7001d12a5f:dgryski_go_rendezvous/vendor/github.com/dgryski/go-rendezvous \
 		dlclark:regexp2:a2a8dda75c91:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
@@ -151,7 +151,7 @@ GH_TUPLE=	\
 		hashicorp:yamux:26ff87cf9493:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
 		igm:sockjs-go:v3.0.1:igm_sockjs_go_v3/vendor/github.com/igm/sockjs-go \
 		inconshreveable:log15:67afb5ed74ec:inconshreveable_log15/vendor/github.com/inconshreveable/log15 \
-		influxdata:influxdb-client-go:5d1fff431040:influxdata_influxdb_client_go_v2/vendor/github.com/influxdata/influxdb-client-go/v2 \
+		influxdata:influxdb-client-go:v2.6.0:influxdata_influxdb_client_go_v2/vendor/github.com/influxdata/influxdb-client-go/v2 \
 		influxdata:line-protocol:9aa0e372d097:influxdata_line_protocol/vendor/github.com/influxdata/line-protocol \
 		jessevdk:go-flags:v1.5.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
 		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
index 03b83f31b553..227b363ac28a 100644
--- a/www/grafana8/distinfo
+++ b/www/grafana8/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1642616805
-SHA256 (grafana-8.3.4.linux-amd64.tar.gz) = 508f8da2e491c10566020c75f4e1e159ca032e3f4a0f4e71879effd602ef5a60
-SIZE (grafana-8.3.4.linux-amd64.tar.gz) = 72637765
+TIMESTAMP = 1644958563
+SHA256 (grafana-8.3.6.linux-amd64.tar.gz) = f2047de7ec42243ddedb95b16e6b5704cb12ec775b07ebf0adc67db00a52c459
+SIZE (grafana-8.3.6.linux-amd64.tar.gz) = 72681343
 SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
 SIZE (v0.3.6.tar.gz) = 22747
 SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
 SIZE (v0.7.3.tar.gz) = 21163
 SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
 SIZE (v0.8.2.tar.gz) = 413897
-SHA256 (grafana-grafana-v8.3.4_GH0.tar.gz) = 459f2d53fcaec87ccdeb9c7c26c7b14f2d9fac5fe85e5c93d80238fa5bca00ee
-SIZE (grafana-grafana-v8.3.4_GH0.tar.gz) = 15842435
+SHA256 (grafana-grafana-v8.3.6_GH0.tar.gz) = 2d5bd2193898d3bd863141578616f9f4e60f89e47164c620d96758f72c3b4224
+SIZE (grafana-grafana-v8.3.6_GH0.tar.gz) = 15851944
 SHA256 (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 3b1214d3ae8568ecba5c03f10b5a1fd700107fe00734d3563e529745ecbc547a
 SIZE (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 42069618
 SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.19.0_GH0.tar.gz) = 0be1c3ee49e6ce8c5607a5aadee2f610a07899db8ff1dd80deb9eb20fce379c0
@@ -97,8 +97,8 @@ SHA256 (cue-lang-cue-v0.4.0_GH0.tar.gz) = 6989ada258115c24da78091e3692b94c54e331
 SIZE (cue-lang-cue-v0.4.0_GH0.tar.gz) = 1248102
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (deepmap-oapi-codegen-v1.6.0_GH0.tar.gz) = e18a7bf803629bad5bc550f16e48441fc30533de0dfff19a750ce50dbc522a45
-SIZE (deepmap-oapi-codegen-v1.6.0_GH0.tar.gz) = 7160463
+SHA256 (deepmap-oapi-codegen-v1.8.2_GH0.tar.gz) = 7e996dc45dbd7f24b0b001bb51b2b3ac02b138538e165702409d6bfa510dcffb
+SIZE (deepmap-oapi-codegen-v1.8.2_GH0.tar.gz) = 160743
 SHA256 (dennwc-varint-v1.0.0_GH0.tar.gz) = 4300e5fb475f56a045f0f65da75b636a09d37ab7c573c82b81257ece96286f57
 SIZE (dennwc-varint-v1.0.0_GH0.tar.gz) = 4769
 SHA256 (dgryski-go-rendezvous-9f7001d12a5f_GH0.tar.gz) = 29584550745fd4b8fce2e2f3def7b9d9ffe2b86cf9b6596b53a660c9bbfe27b6
@@ -301,8 +301,8 @@ SHA256 (igm-sockjs-go-v3.0.1_GH0.tar.gz) = 3496a40c1bb61c99fc58645f790b3f6197e13
 SIZE (igm-sockjs-go-v3.0.1_GH0.tar.gz) = 51558
 SHA256 (inconshreveable-log15-67afb5ed74ec_GH0.tar.gz) = e4c837cfd154a0696c84605595c84459a2d1b2fb33b1abcf284a415d2ca9ab55
 SIZE (inconshreveable-log15-67afb5ed74ec_GH0.tar.gz) = 23261
-SHA256 (influxdata-influxdb-client-go-5d1fff431040_GH0.tar.gz) = f777cc19292cd0091ed6deff5b5191a72406ea57ab9deec1cf17e4476543aae1
-SIZE (influxdata-influxdb-client-go-5d1fff431040_GH0.tar.gz) = 185698
+SHA256 (influxdata-influxdb-client-go-v2.6.0_GH0.tar.gz) = 599d5e88575f4301c6b4cad8e36dc3c3a60c0ac9a3eb6eb932aa20d7f40d91f8
+SIZE (influxdata-influxdb-client-go-v2.6.0_GH0.tar.gz) = 201330
 SHA256 (influxdata-line-protocol-9aa0e372d097_GH0.tar.gz) = acfafae69475c6301b95976f71a060fd03280c2a7d0d7f99ed0ccd4c759484d8
 SIZE (influxdata-line-protocol-9aa0e372d097_GH0.tar.gz) = 29946
 SHA256 (jessevdk-go-flags-v1.5.0_GH0.tar.gz) = d4bf30f729cbc16d2aa0095ac10ca4fadc8f092b9a28990c0cfca2345c3e7ffd
diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
index 7aeae8ab8d7e..11bdefe31cf2 100644
--- a/www/grafana8/pkg-plist
+++ b/www/grafana8/pkg-plist
@@ -397,7 +397,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/AlertRuleItem.tsx
 %%DATADIR%%/public/app/features/alerting/AlertRuleList.test.tsx
 %%DATADIR%%/public/app/features/alerting/AlertRuleList.tsx
-%%DATADIR%%/public/app/features/alerting/AlertRuleListIndex.tsx
 %%DATADIR%%/public/app/features/alerting/AlertTab.tsx
 %%DATADIR%%/public/app/features/alerting/AlertTabCtrl.test.ts
 %%DATADIR%%/public/app/features/alerting/AlertTabCtrl.ts
@@ -405,7 +404,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/EditNotificationChannelPage.tsx
 %%DATADIR%%/public/app/features/alerting/FeatureTogglePage.tsx
 %%DATADIR%%/public/app/features/alerting/NewNotificationChannelPage.tsx
-%%DATADIR%%/public/app/features/alerting/NotificationsIndex.tsx
 %%DATADIR%%/public/app/features/alerting/NotificationsListPage.tsx
 %%DATADIR%%/public/app/features/alerting/StateHistory.tsx
 %%DATADIR%%/public/app/features/alerting/TestRuleResult.test.tsx
@@ -616,6 +614,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/mocks/grafana-notifiers.ts
 %%DATADIR%%/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts
 %%DATADIR%%/public/app/features/alerting/unified/state/AlertingQueryRunner.ts
+%%DATADIR%%/public/app/features/alerting/unified/state/actions.test.ts
 %%DATADIR%%/public/app/features/alerting/unified/state/actions.ts
 %%DATADIR%%/public/app/features/alerting/unified/state/reducers.ts
 %%DATADIR%%/public/app/features/alerting/unified/styles/notifications.ts
@@ -1073,6 +1072,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/folders/FolderSettingsPage.tsx
 %%DATADIR%%/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
 %%DATADIR%%/public/app/features/folders/components/NewDashboardsFolder.tsx
+%%DATADIR%%/public/app/features/folders/state/actions.test.ts
 %%DATADIR%%/public/app/features/folders/state/actions.ts
 %%DATADIR%%/public/app/features/folders/state/navModel.ts
 %%DATADIR%%/public/app/features/folders/state/reducers.test.ts
@@ -2944,6 +2944,9 @@ bin/grafana-server
 %%DATADIR%%/public/build/211.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/2178.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/2178.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/2201.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/2201.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
+%%DATADIR%%/public/build/2201.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/2293.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/2293.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/2502.%%GRAFANA_BUILDHASH%%.js
@@ -3018,9 +3021,6 @@ bin/grafana-server
 %%DATADIR%%/public/build/487.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/4939.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/4939.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
-%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/519.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/519.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/5276.%%GRAFANA_BUILDHASH%%.js
@@ -3041,8 +3041,6 @@ bin/grafana-server
 %%DATADIR%%/public/build/5902.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6146.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/6146.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/6220.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/6220.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6223.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/6223.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6278.%%GRAFANA_BUILDHASH%%.js
@@ -3066,6 +3064,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/686.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6899.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/6899.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/6972.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/6972.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/707.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/707.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/7072.%%GRAFANA_BUILDHASH%%.js
@@ -5068,6 +5068,10 @@ bin/grafana-server
 %%DATADIR%%/public/lib/monaco/min/vs/language/typescript/tsWorker.js.LICENSE.txt
 %%DATADIR%%/public/lib/monaco/min/vs/loader.js
 %%DATADIR%%/public/lib/monaco/min/vs/loader.js.LICENSE.txt
+%%DATADIR%%/public/locales/en/messages.js
+%%DATADIR%%/public/locales/es/messages.js
+%%DATADIR%%/public/locales/fr/messages.js
+%%DATADIR%%/public/locales/pseudo-LOCALE/messages.js
 %%DATADIR%%/public/maps/countries.geojson
 %%DATADIR%%/public/maps/usa-states.geojson
 %%DATADIR%%/public/robots.txt