From nobody Mon Apr 04 06:54:30 2022 X-Original-To: dev-commits-ports-all@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 436641A54670; Mon, 4 Apr 2022 06:54:31 +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 4KX1jM1KbRz4bRj; Mon, 4 Apr 2022 06:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649055271; 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=biYxx7LiEIYxXr3N6t1/LAXz6JFsSbtR1kPGWBcpuAs=; b=D+yAd0LOj2yHpzlOlQI0xk58VZy5LJT2In7B9j08YAZMOSNCOzFtcC9KofTY9dPM4fkSsv gE9ILoFUidfqJoCdWYgaZr51hBzmnQ628eunCIc2DCT0RZ0BhEbikP52SAVhc5ADBRLR9Q fv6p55FDBsd9aM1lMppkHURP5Fej4jUA7F88JuM/Awp1CIYZcb503s2jaTwMfDdXy0D/fn nNHD80rzeTED5fHjO4+StB1zM6MwQQSefPDPdJPTXoC44G/j5jhPtR6q+uDI34uHjpzvzO mf2xnCS3HCyy9SNjh2y2zk+sdg1FR5LAf3+4JR4w711fABUTd9gNpJqzne7f+A== 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 0ECBC5499; Mon, 4 Apr 2022 06:54:31 +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 2346sU8g048299; Mon, 4 Apr 2022 06:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2346sUGB048298; Mon, 4 Apr 2022 06:54:30 GMT (envelope-from git) Date: Mon, 4 Apr 2022 06:54:30 GMT Message-Id: <202204040654.2346sUGB048298@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thomas Zander Subject: git: 1dc12b72d5af - 2022Q2 - www/grafana7: Update to upstream version 7.5.15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 1dc12b72d5af395acf86652ceb506472657a3803 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649055271; 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=biYxx7LiEIYxXr3N6t1/LAXz6JFsSbtR1kPGWBcpuAs=; b=a9YopxoU0JF1PJsx7TbIci0T8r4ajXh8sS1dvA5GqiuQsV2NUVfqye5GvUCbock7PA9I2D PBG+lJxtcJgycxEgTyoVv3DniwlP9lS6hdk9FfMKUqh7iyHdfGGwwzi3AV3pn7VXlvCInd dvamnoO03W2CHGF0zMJTh09+rmM1zNTSICRYwW1P7dZTx1OeGvhAdm7kn+w2WvvfawibC0 VFK79W0K46rwncsU+bJeiHuwRt9vr5/xJCBm903F9eYOlf9GxY0a2WFoFJZsHOQvRyBWsu bHzO8tvXfR/rAMvnjsztSuWMf9brVl/CZW2nAEaq93WwrMFFE87LnvTJCKX+8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649055271; a=rsa-sha256; cv=none; b=Z8UdMrk2KK3GJyRrpHMzPiQop/PNE8q8/vl8sdQyx/ZUNTY9hKS7UxVHpfzpLZzD5RbDbq 8rYqdPUw8cyV6YRGKdkeQ+Eu2VB+ycWmkBCwu0W9LNdtGV8qMN7uTt68E03S6GleK1rNC+ M3E5JE5mbLJInebp47bFY4a3561fT1RiBzhCdEX+7zlgW3AM0Su+yLzuCTlP/bs+Inc9wI PPIBg4og75h4cBL0KuBlEUyOy3nErNGhcu6Xe2RUm52Dh+OVEhJKWcEJ5AMArFBJaVxlrK 0TdpxdTHCbOMwBTkg3+XTDE8Dm36PHIm6/UmmdMlHk5SJXh/e7paFtB8zGfYcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=1dc12b72d5af395acf86652ceb506472657a3803 commit 1dc12b72d5af395acf86652ceb506472657a3803 Author: Thomas Zander AuthorDate: 2022-04-04 05:39:38 +0000 Commit: Thomas Zander CommitDate: 2022-04-04 05:44:23 +0000 www/grafana7: Update to upstream version 7.5.15 PR: 261892 Approved by: Maintainer timeout MFH: 2022Q2 Security: CVE-2022-21702 CVE-2022-21703 CVE-2022-21713 (cherry picked from commit fd6096788e23395815509c76a7cdc2198ce6d5ce) --- www/grafana7/Makefile | 7 +++---- www/grafana7/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/www/grafana7/Makefile b/www/grafana7/Makefile index a11c01aa63ca..ffe102869887 100644 --- a/www/grafana7/Makefile +++ b/www/grafana7/Makefile @@ -1,7 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 7.5.12 -PORTREVISION= 1 +DISTVERSION= 7.5.15 CATEGORIES= www MASTER_SITES+= https://dl.grafana.com/oss/release/:public \ https://gitea.com/xorm/builder/archive/:builder \ @@ -209,7 +208,7 @@ GH_TUPLE= \ # ::v0.8.2:group_name/vendor/xorm.io/xorm (from gitea.com/xorm/xorm@v0.8.2) USE_RC_SUBR= grafana -TAG= 896df74 +TAG= 7dd69b2 GO_TARGET= ./pkg/cmd/grafana-server \ ./pkg/cmd/grafana-cli @@ -223,7 +222,7 @@ SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \ - GRAFANA_BUILDHASH=0cd8deb042c68e8113e4 + GRAFANA_BUILDHASH=dda071b8467acf508f8e GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana diff --git a/www/grafana7/distinfo b/www/grafana7/distinfo index 784db8b0ec08..90428b07df0a 100644 --- a/www/grafana7/distinfo +++ b/www/grafana7/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1640017391 -SHA256 (grafana-7.5.12.linux-amd64.tar.gz) = 8be539042f475f266ac594a1e2512d6231c1e8c82c0e52d1878769291cfe4b6c -SIZE (grafana-7.5.12.linux-amd64.tar.gz) = 52218387 +TIMESTAMP = 1648714426 +SHA256 (grafana-7.5.15.linux-amd64.tar.gz) = 1b69502ddfc491a5ce284f4ea198d94feed787df18d575ff7f292eabac5837cf +SIZE (grafana-7.5.15.linux-amd64.tar.gz) = 52222968 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-v7.5.12_GH0.tar.gz) = 066709ce24f11f5d1f581ab072e36e24f9fd71bba0abb69e28a474ac6224a9c4 -SIZE (grafana-grafana-v7.5.12_GH0.tar.gz) = 11066296 +SHA256 (grafana-grafana-v7.5.15_GH0.tar.gz) = e4d9d72b749faf040629426ff23c4f69d2320a1736089488d9f1015b524f8cff +SIZE (grafana-grafana-v7.5.15_GH0.tar.gz) = 11078800 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (FZambia-eagle-v0.0.1_GH0.tar.gz) = dc2dd0e2e582a2c8e8c7fadab6d1456b9ff2d15fe7c5a8e54986c0d961a200f1