git: d83c498e9b35 - main - www/grafana8: security update to 8.5.22

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthew Seaman <matthew_at_FreeBSD.org>
Date: Sat, 01 Apr 2023 07:13:04 UTC
The branch main has been updated by matthew:

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

commit d83c498e9b35b08257651d5a841993dc23c3abda
Author:     Matthew Seaman <matthew@FreeBSD.org>
AuthorDate: 2023-04-01 07:05:52 +0000
Commit:     Matthew Seaman <matthew@FreeBSD.org>
CommitDate: 2023-04-01 07:12:54 +0000

    www/grafana8: security update to 8.5.22
    
    https://grafana.com/blog/2023/03/22/grafana-security-release-new-versions-with-security-fixes-for-cve-2023-1410/
    
    PR:             270562
    Approved by:    Boris Korzun (maintainer)
    MFH:            2023Q2
    Security:       955eb3cc-ce0b-11ed-825f-6c3be5272acd
---
 www/grafana8/Makefile  |  7 +++----
 www/grafana8/distinfo  | 10 +++++-----
 www/grafana8/pkg-plist |  3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index fbb4a2a482e2..1a11d6527e85 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.5.21
-PORTREVISION=	2
+DISTVERSION=	8.5.22
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public
 PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}
@@ -24,7 +23,7 @@ USES=		cpe go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		f5c82de
+TAG=		210e06b
 
 GO_TARGET=	./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
@@ -39,7 +38,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
-		GRAFANA_BUILDHASH=42e3f3c3450719e33235
+		GRAFANA_BUILDHASH=0dfd49f78dc93c695e30
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
index c085c2b8686c..ac806925545e 100644
--- a/www/grafana8/distinfo
+++ b/www/grafana8/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1680013967
-SHA256 (grafana-8.5.21.linux-amd64.tar.gz) = 5f12da13a12ff4ebc41e0a5a8b68073896482d0ee734397094f9bedbb7be331e
-SIZE (grafana-8.5.21.linux-amd64.tar.gz) = 79338446
+TIMESTAMP = 1680271514
+SHA256 (grafana-8.5.22.linux-amd64.tar.gz) = 94a10da45bb09dca16e1f2d67397d7939c15306d0c2db1f5b3929113008f886e
+SIZE (grafana-8.5.22.linux-amd64.tar.gz) = 79199127
 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 (grafana-grafana-v8.5.21_GH0.tar.gz) = 0073aa85731e2bb17737756effe753ea61d5c1ba35abc00f6dd206c15a6bdfd3
-SIZE (grafana-grafana-v8.5.21_GH0.tar.gz) = 18833655
+SHA256 (grafana-grafana-v8.5.22_GH0.tar.gz) = 7a1ca31a4acfcf995f83e81895b44c1194a64173511c73a1f25048a6fbd3947e
+SIZE (grafana-grafana-v8.5.22_GH0.tar.gz) = 18873937
 SHA256 (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 219e6cdb7b26dcb4bdac35de2f06abf9caa71810fe88395e692f42729c8e55f5
 SIZE (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 46199521
 SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.22.0_GH0.tar.gz) = 7375ac472dc4a19c5ce4eb9e646c20d97a9802e68790dc968b49c7874177b331
diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
index 6213f67a67cc..9b85f436619e 100644
--- a/www/grafana8/pkg-plist
+++ b/www/grafana8/pkg-plist
@@ -3788,9 +3788,6 @@ bin/grafana-server
 %%DATADIR%%/public/build/prometheusPlugin.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/react-monaco-editor.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/react-monaco-editor.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/rst2html.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/rst2html.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
-%%DATADIR%%/public/build/rst2html.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/runtime.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/runtime.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/static/img/codicon.56dba998.ttf