From nobody Sat Apr 01 07:20:44 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PpT8Y2rtpz431FW; Sat, 1 Apr 2023 07:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PpT8Y1pwfz3m20; Sat, 1 Apr 2023 07:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680333645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aq4JDCH33LfkBKLrMuIGddnN69tFqT6sWeWE8yHUNVw=; b=Z2ORzrhbqpicK/Is7qgTkdCl9Tr8FCARnW0Q5jc2jPf+c530hKCPbUVTJMSVeiEspHGo3H o5qBBBAmcyh96RE3lxVCULvUr7QH0+Na7emWXLAz8yEq03SKbWJuQ+9SSwaLZfTXFXWsD/ QhdkYPk+XST0LPNABrm1JHrOfueBHcAtVo6KxAyFDj5nQyw1p4FzZ4GGfAJUOjgR8NI2Eh GVQ7uhGE0Dx6M7RnMGpdCWMJeVf/diA20UFONLscWx46T7CNQWi9TpYkdqKNcMpVILF1+P 6tVQ3pniW4bYE1Ci65FJUtGKfOSY12lnvdQjHtudE9XPoa83P1lhkntQuTjK8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680333645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aq4JDCH33LfkBKLrMuIGddnN69tFqT6sWeWE8yHUNVw=; b=dIqmyLOwJeSaLcMp09ZDiycUutR5T6GuDZO1UdxFc9eSJRuU4zdYX7LjBH9AtFmiivz+8C LKrez5Yc39rW7fjZUGJNO1cG8Rjr2bMn6E0k2Qplesj5+HKpugbNjfjnU2LAp46YwJRxRL Tlsxm91iD/uXeNcodzpHkOjSIXZpQLiDO9MOKhcp2Gvz8l2DzyQrRvY6WUixvBLAULh0Dm ubxTx7fbwVE0stCN6CqtUO5QsWHRhThZkmdTWHZhP5KU3KoDucVwgw6EPH+WKviyROEAa4 sEffViI3gyQWrrp5ocZKRBQWXvFbWTmEGwa2XlupKFG+o6+vlN2azdHuR2MXQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680333645; a=rsa-sha256; cv=none; b=Vcee3jznGTxZLaPTaeYY+hUdznwOrZaujQTBRzd5spTcn2juHrJN0Cdk6icY4ufKrS+X2U A2n4e4pDWRIwEpzY5lngJUd+9igsQ+FrVbmqWM2z01Iu3XWxzcJ7ebaVyMrWqKzMVTvYnn OdKFH7p/xH9OTf69Dl9gifN/iTGk1VitUAGt3X/u868SumatvTuNNY9SkCGs+TW66KXljJ RZZoPnq0ezbnaQCpOgz5XWnpP+bZrLPRVSBoQpilYlKwehYnRQveJiTtugjPEoo7bFZDdN PJc1me3qqZ4YHkfF7M12v1XG3ntG1CEmhskk5E61HKOJyEqn2eg8yvOKsBLKdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PpT8Y0gcrzRcV; Sat, 1 Apr 2023 07:20:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3317Kja6008954; Sat, 1 Apr 2023 07:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3317Ki0H008953; Sat, 1 Apr 2023 07:20:44 GMT (envelope-from git) Date: Sat, 1 Apr 2023 07:20:44 GMT Message-Id: <202304010720.3317Ki0H008953@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthew Seaman Subject: git: c0eadf3e6a75 - 2023Q2 - www/grafana8: security update to 8.5.22 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: c0eadf3e6a75c23a9238847a11e2a61f784456eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0eadf3e6a75c23a9238847a11e2a61f784456eb commit c0eadf3e6a75c23a9238847a11e2a61f784456eb Author: Matthew Seaman AuthorDate: 2023-04-01 07:05:52 +0000 Commit: Matthew Seaman CommitDate: 2023-04-01 07:20:38 +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 (cherry picked from commit d83c498e9b35b08257651d5a841993dc23c3abda) --- 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