git: ef150bc72608 - 2023Q1 - www/grafana9: Update to 9.3.8 (Fixes security vulnerabilities)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Fri, 03 Mar 2023 12:17:31 UTC
The branch 2023Q1 has been updated by fernape:

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

commit ef150bc7260870482ab4087c455a339166ac3c9c
Author:     Boris Korzun <drtr0jan@yandex.ru>
AuthorDate: 2023-03-03 08:53:21 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-03-03 12:13:07 +0000

    www/grafana9: Update to 9.3.8 (Fixes security vulnerabilities)
    
    ChangeLog:
    https://grafana.com/blog/2023/02/28/grafana-security-release-new-versions-with-security-fixes-for-cve-2023-0594-cve-2023-0507-and-cve-2023-22462/
    
    PR:             269903
    Reported by:    drtr0jan@yandex.ru (maintainer)
    MFH:            2023Q1 (security fix)
    Security:       CVE-2023-0594 CVE-2023-0507 CVE-2023-22462
    
    (cherry picked from commit f0842e53c88bc6269b2318aa46ba90d02e2dc236)
---
 www/grafana9/Makefile  |  8 ++---
 www/grafana9/distinfo  | 14 ++++-----
 www/grafana9/pkg-plist | 81 +++++++++++++++++++++++++-------------------------
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
index a84c2a6fe8cf..5a752c1ccc8b 100644
--- a/www/grafana9/Makefile
+++ b/www/grafana9/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.3.6
-PORTREVISION=	1
+DISTVERSION=	9.3.8
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
@@ -26,10 +25,11 @@ USES=		cpe go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		978237e
+TAG=		7ab70db
 
 GO_MODULE=	github.com/grafana/grafana
-GO_TARGET=	./pkg/cmd/grafana-server \
+GO_TARGET=	./pkg/cmd/grafana \
+		./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
index a37312e752b6..9cf7aa800f0d 100644
--- a/www/grafana9/distinfo
+++ b/www/grafana9/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1675776469
-SHA256 (go/www_grafana9/grafana-grafana-v9.3.6_GH0/grafana-9.3.6.linux-amd64.tar.gz) = 8d150fadbea872abb1e12acc9bf1f0ff60ee1bbb23da32a14a59f5eb29e31f03
-SIZE (go/www_grafana9/grafana-grafana-v9.3.6_GH0/grafana-9.3.6.linux-amd64.tar.gz) = 89397564
-SHA256 (go/www_grafana9/grafana-grafana-v9.3.6_GH0/go.mod) = a1b019554881a548201f41af3abeb8c7fa45918db2e88c8ebdc84c636e0dd1a7
-SIZE (go/www_grafana9/grafana-grafana-v9.3.6_GH0/go.mod) = 19091
-SHA256 (go/www_grafana9/grafana-grafana-v9.3.6_GH0/grafana-grafana-v9.3.6_GH0.tar.gz) = 59f3c82fa934869ac5d9292cd5c38277748399207c4ae552bb1fa58abb2bf25e
-SIZE (go/www_grafana9/grafana-grafana-v9.3.6_GH0/grafana-grafana-v9.3.6_GH0.tar.gz) = 25657550
+TIMESTAMP = 1677605450
+SHA256 (go/www_grafana9/grafana-grafana-v9.3.8_GH0/grafana-9.3.8.linux-amd64.tar.gz) = b38660959c7ead1300a43da6c3180e3e03508a6837f33104173ff19b487cd6c4
+SIZE (go/www_grafana9/grafana-grafana-v9.3.8_GH0/grafana-9.3.8.linux-amd64.tar.gz) = 69932750
+SHA256 (go/www_grafana9/grafana-grafana-v9.3.8_GH0/go.mod) = 27182cb82ea032bd06b74d05880c0707158536e5aacde97a736bd7f7650674ef
+SIZE (go/www_grafana9/grafana-grafana-v9.3.8_GH0/go.mod) = 19482
+SHA256 (go/www_grafana9/grafana-grafana-v9.3.8_GH0/grafana-grafana-v9.3.8_GH0.tar.gz) = 56baec20890bfd6ea23398c905aa5d181b8ba9102b6e616d16c53ae47e902a34
+SIZE (go/www_grafana9/grafana-grafana-v9.3.8_GH0/grafana-grafana-v9.3.8_GH0.tar.gz) = 25737668
diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist
index 357c1777d597..50811feef665 100644
--- a/www/grafana9/pkg-plist
+++ b/www/grafana9/pkg-plist
@@ -1,3 +1,4 @@
+bin/grafana
 bin/grafana-cli
 bin/grafana-server
 @sample %%ETCDIR%%/grafana.ini.sample
@@ -3889,9 +3890,9 @@ bin/grafana-server
 %%DATADIR%%/public/build/2304.f763e517edffdf75f136.js
 %%DATADIR%%/public/build/2304.f763e517edffdf75f136.js.LICENSE.txt
 %%DATADIR%%/public/build/2304.f763e517edffdf75f136.js.map
-%%DATADIR%%/public/build/2362.5e93872490cc5d80351e.js
-%%DATADIR%%/public/build/2362.5e93872490cc5d80351e.js.LICENSE.txt
-%%DATADIR%%/public/build/2362.5e93872490cc5d80351e.js.map
+%%DATADIR%%/public/build/2362.d06d6cb2bdc4890cef9d.js
+%%DATADIR%%/public/build/2362.d06d6cb2bdc4890cef9d.js.LICENSE.txt
+%%DATADIR%%/public/build/2362.d06d6cb2bdc4890cef9d.js.map
 %%DATADIR%%/public/build/2386.5fa7b6e3b3ed30142474.js
 %%DATADIR%%/public/build/2386.5fa7b6e3b3ed30142474.js.LICENSE.txt
 %%DATADIR%%/public/build/2386.5fa7b6e3b3ed30142474.js.map
@@ -3909,8 +3910,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js
 %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js.LICENSE.txt
 %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js.map
-%%DATADIR%%/public/build/2665.690db4abd2fafb9e7c5e.js
-%%DATADIR%%/public/build/2665.690db4abd2fafb9e7c5e.js.map
+%%DATADIR%%/public/build/2665.ec91cd5ffff220ad83f9.js
+%%DATADIR%%/public/build/2665.ec91cd5ffff220ad83f9.js.map
 %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js
 %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.LICENSE.txt
 %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.map
@@ -3930,6 +3931,9 @@ bin/grafana-server
 %%DATADIR%%/public/build/3159.e543e4bd6b3d23d18c17.js
 %%DATADIR%%/public/build/3159.e543e4bd6b3d23d18c17.js.LICENSE.txt
 %%DATADIR%%/public/build/3159.e543e4bd6b3d23d18c17.js.map
+%%DATADIR%%/public/build/3217.ea2a014a59d99960d7a7.js
+%%DATADIR%%/public/build/3217.ea2a014a59d99960d7a7.js.LICENSE.txt
+%%DATADIR%%/public/build/3217.ea2a014a59d99960d7a7.js.map
 %%DATADIR%%/public/build/3270.7d8a80167bb498023bc4.js
 %%DATADIR%%/public/build/3270.7d8a80167bb498023bc4.js.map
 %%DATADIR%%/public/build/3299.3fedc065e7ac6b07d3b3.js
@@ -4087,8 +4091,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/7561.fa031ecb07ce18b5b0fa.js.map
 %%DATADIR%%/public/build/7638.ea1a68ae3bc410346c26.js
 %%DATADIR%%/public/build/7638.ea1a68ae3bc410346c26.js.map
-%%DATADIR%%/public/build/7685.3ef20daf0ddf6fd8a772.js
-%%DATADIR%%/public/build/7685.3ef20daf0ddf6fd8a772.js.map
+%%DATADIR%%/public/build/7685.56d7a692e9793350605d.js
+%%DATADIR%%/public/build/7685.56d7a692e9793350605d.js.map
 %%DATADIR%%/public/build/7717.d08a494dd42ad190a5da.js
 %%DATADIR%%/public/build/7717.d08a494dd42ad190a5da.js.map
 %%DATADIR%%/public/build/7751.d3436947408fd3dc90f4.js
@@ -4110,14 +4114,11 @@ bin/grafana-server
 %%DATADIR%%/public/build/7978.82e87dd750040fc348d3.js
 %%DATADIR%%/public/build/7978.82e87dd750040fc348d3.js.LICENSE.txt
 %%DATADIR%%/public/build/7978.82e87dd750040fc348d3.js.map
-%%DATADIR%%/public/build/805.dab4bcdab5a814dbcdba.js
-%%DATADIR%%/public/build/805.dab4bcdab5a814dbcdba.js.LICENSE.txt
-%%DATADIR%%/public/build/805.dab4bcdab5a814dbcdba.js.map
-%%DATADIR%%/public/build/8057.c68ff85adcf9d233cf4f.js
-%%DATADIR%%/public/build/8057.c68ff85adcf9d233cf4f.js.map
+%%DATADIR%%/public/build/8057.ef076e6227c4ddb3be3a.js
+%%DATADIR%%/public/build/8057.ef076e6227c4ddb3be3a.js.map
 %%DATADIR%%/public/build/810.31eaff381291e04929f0.js
-%%DATADIR%%/public/build/8112.357d38790b2ba230bdc5.js
-%%DATADIR%%/public/build/8112.357d38790b2ba230bdc5.js.map
+%%DATADIR%%/public/build/8112.11c30528734a2fe7fc11.js
+%%DATADIR%%/public/build/8112.11c30528734a2fe7fc11.js.map
 %%DATADIR%%/public/build/8186.f7a18e0fda806fdf4490.js
 %%DATADIR%%/public/build/8186.f7a18e0fda806fdf4490.js.map
 %%DATADIR%%/public/build/8242.e64723069376d874294f.js
@@ -4145,8 +4146,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/871.300e685cad2e3ab4a63e.js
 %%DATADIR%%/public/build/871.300e685cad2e3ab4a63e.js.LICENSE.txt
 %%DATADIR%%/public/build/871.300e685cad2e3ab4a63e.js.map
-%%DATADIR%%/public/build/8832.6c4e9f11a3754a2e15cd.js
-%%DATADIR%%/public/build/8832.6c4e9f11a3754a2e15cd.js.map
+%%DATADIR%%/public/build/8832.6120aea2e246adf85e01.js
+%%DATADIR%%/public/build/8832.6120aea2e246adf85e01.js.map
 %%DATADIR%%/public/build/8922.05437679eb09941b886d.js
 %%DATADIR%%/public/build/8922.05437679eb09941b886d.js.LICENSE.txt
 %%DATADIR%%/public/build/8922.05437679eb09941b886d.js.map
@@ -4214,20 +4215,20 @@ bin/grafana-server
 %%DATADIR%%/public/build/AdminListOrgsPage.d5eb89ae2e83a3429767.js.map
 %%DATADIR%%/public/build/AdminSettings.a293ece8d676509d6703.js
 %%DATADIR%%/public/build/AdminSettings.a293ece8d676509d6703.js.map
-%%DATADIR%%/public/build/AlertAmRoutes.5208bfdc0d897feafb04.js
-%%DATADIR%%/public/build/AlertAmRoutes.5208bfdc0d897feafb04.js.map
-%%DATADIR%%/public/build/AlertGroups.0fb95d41e7b18ae7c833.js
-%%DATADIR%%/public/build/AlertGroups.0fb95d41e7b18ae7c833.js.map
+%%DATADIR%%/public/build/AlertAmRoutes.ba8b7674d327e6436349.js
+%%DATADIR%%/public/build/AlertAmRoutes.ba8b7674d327e6436349.js.map
+%%DATADIR%%/public/build/AlertGroups.6893c7c120aa475e84e9.js
+%%DATADIR%%/public/build/AlertGroups.6893c7c120aa475e84e9.js.map
 %%DATADIR%%/public/build/AlertRuleList.5f1ed46cfb3b0f91ebcd.js
 %%DATADIR%%/public/build/AlertRuleList.5f1ed46cfb3b0f91ebcd.js.map
 %%DATADIR%%/public/build/AlertRuleListIndex.b6fc1c64cafc55fc2582.js
 %%DATADIR%%/public/build/AlertRuleListIndex.b6fc1c64cafc55fc2582.js.map
-%%DATADIR%%/public/build/AlertSilences.222a8b9b18664bb38ad3.js
-%%DATADIR%%/public/build/AlertSilences.222a8b9b18664bb38ad3.js.map
+%%DATADIR%%/public/build/AlertSilences.48082ee02828fef83927.js
+%%DATADIR%%/public/build/AlertSilences.48082ee02828fef83927.js.map
 %%DATADIR%%/public/build/AlertTabCtrl.d62558583fe564e04d72.js
 %%DATADIR%%/public/build/AlertTabCtrl.d62558583fe564e04d72.js.map
-%%DATADIR%%/public/build/AlertingAdmin.373b821d3c9fd8ade6d2.js
-%%DATADIR%%/public/build/AlertingAdmin.373b821d3c9fd8ade6d2.js.map
+%%DATADIR%%/public/build/AlertingAdmin.e58d56682a63daad108d.js
+%%DATADIR%%/public/build/AlertingAdmin.e58d56682a63daad108d.js.map
 %%DATADIR%%/public/build/AlertingFeatureTogglePage.15afbfe4479ecdbeaa7f.js
 %%DATADIR%%/public/build/AlertingFeatureTogglePage.15afbfe4479ecdbeaa7f.js.map
 %%DATADIR%%/public/build/AlertingRedirectToRule.b51d96d80880a50bb597.js
@@ -4261,10 +4262,10 @@ bin/grafana-server
 %%DATADIR%%/public/build/DashboardListPage.ee5d4ab3eea6207cd172.js.map
 %%DATADIR%%/public/build/DashboardPage.83746403e354ba80cece.js
 %%DATADIR%%/public/build/DashboardPage.83746403e354ba80cece.js.map
-%%DATADIR%%/public/build/DataSourceDashboards.3b1f2c4ede2476627c5c.js
-%%DATADIR%%/public/build/DataSourceDashboards.3b1f2c4ede2476627c5c.js.map
-%%DATADIR%%/public/build/DataSourcesListPage.2ab8eafa6cf0715becb9.js
-%%DATADIR%%/public/build/DataSourcesListPage.2ab8eafa6cf0715becb9.js.map
+%%DATADIR%%/public/build/DataSourceDashboards.afd92e11ed48063858f2.js
+%%DATADIR%%/public/build/DataSourceDashboards.afd92e11ed48063858f2.js.map
+%%DATADIR%%/public/build/DataSourcesListPage.8d7bded6cf45ebe2573e.js
+%%DATADIR%%/public/build/DataSourcesListPage.8d7bded6cf45ebe2573e.js.map
 %%DATADIR%%/public/build/EditDataSourcePage.cc935d4109a6d0d98b75.js
 %%DATADIR%%/public/build/EditDataSourcePage.cc935d4109a6d0d98b75.js.map
 %%DATADIR%%/public/build/EditNotificationChannel.90b0814fa180d056201e.js
@@ -4289,14 +4290,14 @@ bin/grafana-server
 %%DATADIR%%/public/build/MuteTimings.dd7e70f2aee69b494bce.js.map
 %%DATADIR%%/public/build/NewDashboardsFolder.bf9e41a666539fec9947.js
 %%DATADIR%%/public/build/NewDashboardsFolder.bf9e41a666539fec9947.js.map
-%%DATADIR%%/public/build/NewDataSourcePage.0ec075e0c1ff5e789d27.js
-%%DATADIR%%/public/build/NewDataSourcePage.0ec075e0c1ff5e789d27.js.map
+%%DATADIR%%/public/build/NewDataSourcePage.c7a5c0d8397c61fca800.js
+%%DATADIR%%/public/build/NewDataSourcePage.c7a5c0d8397c61fca800.js.map
 %%DATADIR%%/public/build/NewNotificationChannel.75b8f2aad9aa8bd19dda.js
 %%DATADIR%%/public/build/NewNotificationChannel.75b8f2aad9aa8bd19dda.js.map
 %%DATADIR%%/public/build/NewOrgPage.6a8ea80224f63c6c35e0.js
 %%DATADIR%%/public/build/NewOrgPage.6a8ea80224f63c6c35e0.js.map
-%%DATADIR%%/public/build/NotificationsListPage.fe2df927e956b4e21373.js
-%%DATADIR%%/public/build/NotificationsListPage.fe2df927e956b4e21373.js.map
+%%DATADIR%%/public/build/NotificationsListPage.7006a89256fce1e1078a.js
+%%DATADIR%%/public/build/NotificationsListPage.7006a89256fce1e1078a.js.map
 %%DATADIR%%/public/build/NotificationsPage.0e440523d52a03c500be.js
 %%DATADIR%%/public/build/NotificationsPage.0e440523d52a03c500be.js.map
 %%DATADIR%%/public/build/OrgDetailsPage.b14ed5e80332f28d89df.js
@@ -4359,8 +4360,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/UsersListPage.7b075a18e072d368f511.js.map
 %%DATADIR%%/public/build/alertmanagerPlugin.a51695992a96bbec5d44.js
 %%DATADIR%%/public/build/alertmanagerPlugin.a51695992a96bbec5d44.js.map
-%%DATADIR%%/public/build/app.07d3112527342c2a7f3d.js
-%%DATADIR%%/public/build/app.07d3112527342c2a7f3d.js.map
+%%DATADIR%%/public/build/app.fc73e463a9738a53c54b.js
+%%DATADIR%%/public/build/app.fc73e463a9738a53c54b.js.map
 %%DATADIR%%/public/build/azureMonitorPlugin.93e9bbeebabd360f746b.js
 %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js
 %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js.map
@@ -4417,22 +4418,22 @@ bin/grafana-server
 %%DATADIR%%/public/build/postgresPlugin.0821689f280b14010c04.js.map
 %%DATADIR%%/public/build/prom-query-field.fe19a4c33d10f38237bb.js
 %%DATADIR%%/public/build/prom-query-field.fe19a4c33d10f38237bb.js.map
-%%DATADIR%%/public/build/prometheusPlugin.e97beb02dd61f8f92798.js
-%%DATADIR%%/public/build/prometheusPlugin.e97beb02dd61f8f92798.js.map
+%%DATADIR%%/public/build/prometheusPlugin.1369e383fcbc3982b54d.js
+%%DATADIR%%/public/build/prometheusPlugin.1369e383fcbc3982b54d.js.map
 %%DATADIR%%/public/build/react-monaco-editor.e14bbc58d666e16404f1.js
 %%DATADIR%%/public/build/react-monaco-editor.e14bbc58d666e16404f1.js.map
 %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js
 %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.LICENSE.txt
 %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.map
-%%DATADIR%%/public/build/runtime.9fb31eea7b1e62a3fced.js
-%%DATADIR%%/public/build/runtime.9fb31eea7b1e62a3fced.js.map
+%%DATADIR%%/public/build/runtime.fdf36d5f329c9b0eb9e6.js
+%%DATADIR%%/public/build/runtime.fdf36d5f329c9b0eb9e6.js.map
 %%DATADIR%%/public/build/scenes.327cff3bd72cbcbbac9d.js
 %%DATADIR%%/public/build/scenes.327cff3bd72cbcbbac9d.js.map
 %%DATADIR%%/public/build/static/img/codicon.b797181c.ttf
 %%DATADIR%%/public/build/tableOldPlugin.08faa61b2a79ae8204fd.js
 %%DATADIR%%/public/build/tableOldPlugin.08faa61b2a79ae8204fd.js.map
-%%DATADIR%%/public/build/tempoPlugin.7eb517d54c5b3bc17a91.js
-%%DATADIR%%/public/build/tempoPlugin.7eb517d54c5b3bc17a91.js.map
+%%DATADIR%%/public/build/tempoPlugin.ca65164e21145c67b5e3.js
+%%DATADIR%%/public/build/tempoPlugin.ca65164e21145c67b5e3.js.map
 %%DATADIR%%/public/build/testDataDSPlugin.719b04b2a874b953aab4.js
 %%DATADIR%%/public/build/testDataDSPlugin.719b04b2a874b953aab4.js.map
 %%DATADIR%%/public/build/visjs-network.2e315f7e4e85105068f8.js