From nobody Thu Dec 1 11:36:53 2022 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 4NNDYx57Wfz4hwJ4; Thu, 1 Dec 2022 11:36:53 +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 4NNDYx4ZF3z3MWS; Thu, 1 Dec 2022 11:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669894613; 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=FzxKG2REbOzKTOonPDU/MrH1A6EGpe3WMmfN6nWvO7o=; b=leOTyWTOiTK5JEfOYp6Tq+NmnTioyajp7DKpjXninr+hd5U4QTqr8F2Pfleu/qOgI3n5mT S1glgay+iEDbzKkFPDU4GXBuZMS92UOfk5Pac3OZav0n6YkZHDtMUX2sudgKB7oTnKD3yw rrOsOWjhDn21EYCwdJjOz91BuVpt+2q1Id8ST+6omDh0H1Uxjf9e2rbBFDmS9s0Izm4AIi o3KyuxrQ4wiU6tUAbv+B0fAv5E8yS6WK3+my+L7FCrsMxpka3y1XrlUNHaeuu+Q1/I5rIz u6U8HADwBoZ+KHEKHx8VdwSZDsHpSKsSx6pGkcqHi/7GP+lM0G4L83ah90SOIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669894613; 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=FzxKG2REbOzKTOonPDU/MrH1A6EGpe3WMmfN6nWvO7o=; b=jyCdU1YXSLBegfLKiDxlCaJO9Om3JlEZ2TY7O6hp6EOaPlKX5q1iMpdxBuj8Dgk3Vs+f4t 4RylTiiqRnry91eNTphx6Hv7t3HnxWQaeFzezY0NthIi7N9cFb9ahzgMsy8otFwN9mFT8H LmIpI6K3YtxB5ONYD/0IvDNGcYdAXNRBPT0ZxUEuP6pA4ND3cJ+D5i53FnXX4ZaCyEIere mMYKdp/0rD0qM4mmdRiAEr8JYassj/Rer2AGSk1k49jFRifeqcu9f+RswjEqaTrmMq9RHD /r6STmn9eTrgKg5mXim17Qs4VmDYnwB5QnBergCcn/0ZiaAhPzn/UDoKamxkfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669894613; a=rsa-sha256; cv=none; b=n2CEyoQuiJyFlCMYUVYu4a3QGuuCAQFN5Y/MfBS5Whq4lDnOnknmPnKeMCI/iXAUCjBX9Y aySVIVolEEVi2tVbGRdBQcjkjqhpgCZldid+i97vQBj1P7V2cGg+bdynWfzMmD6vk86LSP CBE450XwJfRQo3a3gV2iddtpgfgNNK+oy35lCqCshFZdB+L+YMi+3/xIJpk9dpYCkSZDiv BSV/AFq4nm434QoKy1f1Avx/l76vrNbFKXI5lNRDr9dfi7VpepdUmrd3vLtds5xfzJtiWl +NbSnrQ3zqRw5ymGqQyLkBWcjncUuk/dJcNQX7OpXrKyTtsb+71n2O7NxiTxQA== 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 4NNDYx3d3fzbWp; Thu, 1 Dec 2022 11:36:53 +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 2B1Bar9O037441; Thu, 1 Dec 2022 11:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1BarfX037440; Thu, 1 Dec 2022 11:36:53 GMT (envelope-from git) Date: Thu, 1 Dec 2022 11:36:53 GMT Message-Id: <202212011136.2B1BarfX037440@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: fb9fa86fb245 - 2022Q4 - www/grafana9: Update to 9.2.7 (CVE-2022-31097) 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: fb9fa86fb245e89ca5074b9bfa0c1c774b232d92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb9fa86fb245e89ca5074b9bfa0c1c774b232d92 commit fb9fa86fb245e89ca5074b9bfa0c1c774b232d92 Author: Boris Korzun AuthorDate: 2022-11-30 17:40:01 +0000 Commit: Fernando Apesteguía CommitDate: 2022-12-01 11:32:35 +0000 www/grafana9: Update to 9.2.7 (CVE-2022-31097) ChangeLog: https://grafana.com/blog/2022/11/29/grafana-security-release-new-versions-with-high-severity-security-fix-for-cve-2022-31097/ PR: 268078 Reported by: drtr0jan@yandex.ru (maintainer) MFH: 2022Q4 (security release) Security: CVE-2022-31097 (cherry picked from commit 88270fe5a24f6286e7c774be0fa8825ee47981a6) --- www/grafana9/Makefile | 4 ++-- www/grafana9/distinfo | 14 +++++++------- www/grafana9/pkg-plist | 50 +++++++++++++++++++++++++++----------------------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile index ac87f53a2b34..9fe1af873dc0 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 9.2.4 +DISTVERSION= 9.2.7 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod @@ -25,7 +25,7 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 64017e8 +TAG= fe17b64 GO_MODULE= github.com/grafana/grafana GO_TARGET= ./pkg/cmd/grafana-server \ diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo index 3f935834f24a..dc47ef62bb2c 100644 --- a/www/grafana9/distinfo +++ b/www/grafana9/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1667917958 -SHA256 (go/www_grafana9/grafana-grafana-v9.2.4_GH0/grafana-9.2.4.linux-amd64.tar.gz) = 94d9cbea08120a9c51c29dfe66c8c85ef817af03b3ceb50bbb1b2bb2ee3bc07b -SIZE (go/www_grafana9/grafana-grafana-v9.2.4_GH0/grafana-9.2.4.linux-amd64.tar.gz) = 96905343 -SHA256 (go/www_grafana9/grafana-grafana-v9.2.4_GH0/go.mod) = a806d823f6993ceb32c2b5c90cd34b29f7f93b2a669e24f935cef771b3e3e96e -SIZE (go/www_grafana9/grafana-grafana-v9.2.4_GH0/go.mod) = 18431 -SHA256 (go/www_grafana9/grafana-grafana-v9.2.4_GH0/grafana-grafana-v9.2.4_GH0.tar.gz) = 056b235219a9fb9e78d8eaa477d123c9939cb25a3d4c4a71fdf7b397d69bfc5c -SIZE (go/www_grafana9/grafana-grafana-v9.2.4_GH0/grafana-grafana-v9.2.4_GH0.tar.gz) = 25244668 +TIMESTAMP = 1669802121 +SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-9.2.7.linux-amd64.tar.gz) = 17794cc438e61acc3070e13b74eef4a3fac0f68d6d85b18840649837f3051722 +SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-9.2.7.linux-amd64.tar.gz) = 97192376 +SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/go.mod) = fc9128d1a814a1c931f146a799e3a33e348ce7d18feba314831839cf074b970b +SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/go.mod) = 18432 +SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-grafana-v9.2.7_GH0.tar.gz) = 057164b8901c89d009b4d7181b88cd4b1be92710b8c843043961a0943b437e19 +SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-grafana-v9.2.7_GH0.tar.gz) = 25259268 diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist index b7dae5e34c89..fe3bdccf6a82 100644 --- a/www/grafana9/pkg-plist +++ b/www/grafana9/pkg-plist @@ -1653,6 +1653,8 @@ bin/grafana-server %%DATADIR%%/public/app/features/plugins/sql/index.ts %%DATADIR%%/public/app/features/plugins/sql/types.ts %%DATADIR%%/public/app/features/plugins/sql/utils/formatSQL.ts +%%DATADIR%%/public/app/features/plugins/sql/utils/migration.test.ts +%%DATADIR%%/public/app/features/plugins/sql/utils/migration.ts %%DATADIR%%/public/app/features/plugins/sql/utils/sql.utils.ts %%DATADIR%%/public/app/features/plugins/sql/utils/useSqlChange.ts %%DATADIR%%/public/app/features/plugins/tests/datasource_srv.test.ts @@ -2860,7 +2862,6 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/datasource/mysql/README.md %%DATADIR%%/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx %%DATADIR%%/public/app/plugins/datasource/mysql/fields.ts -%%DATADIR%%/public/app/plugins/datasource/mysql/functions.ts %%DATADIR%%/public/app/plugins/datasource/mysql/img/mysql_logo.svg %%DATADIR%%/public/app/plugins/datasource/mysql/module.ts %%DATADIR%%/public/app/plugins/datasource/mysql/mySqlMetaQuery.ts @@ -3689,6 +3690,9 @@ bin/grafana-server %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js.LICENSE.txt %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js.map +%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js +%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js.LICENSE.txt +%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js.map %%DATADIR%%/public/build/1716.976a5d889838c7410b59.js %%DATADIR%%/public/build/1716.976a5d889838c7410b59.js.map %%DATADIR%%/public/build/1730.89db0656c7806953c9fa.js @@ -3723,8 +3727,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/266.8b15c3a14edd091baf9d.js -%%DATADIR%%/public/build/266.8b15c3a14edd091baf9d.js.map +%%DATADIR%%/public/build/266.8213e343aef41086ebee.js +%%DATADIR%%/public/build/266.8213e343aef41086ebee.js.map %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.LICENSE.txt %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.map @@ -3763,14 +3767,14 @@ bin/grafana-server %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js.LICENSE.txt %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js.map -%%DATADIR%%/public/build/3499.cdd66e7ab1c06d0d350f.js -%%DATADIR%%/public/build/3499.cdd66e7ab1c06d0d350f.js.map +%%DATADIR%%/public/build/3499.3a57ba9485684d30dc56.js +%%DATADIR%%/public/build/3499.3a57ba9485684d30dc56.js.map %%DATADIR%%/public/build/3590.380638a235539199c060.js %%DATADIR%%/public/build/3590.380638a235539199c060.js.LICENSE.txt %%DATADIR%%/public/build/3590.380638a235539199c060.js.map -%%DATADIR%%/public/build/3593.2e49ecf3d565732acbf1.js -%%DATADIR%%/public/build/3593.2e49ecf3d565732acbf1.js.LICENSE.txt -%%DATADIR%%/public/build/3593.2e49ecf3d565732acbf1.js.map +%%DATADIR%%/public/build/3593.210578717848c470b500.js +%%DATADIR%%/public/build/3593.210578717848c470b500.js.LICENSE.txt +%%DATADIR%%/public/build/3593.210578717848c470b500.js.map %%DATADIR%%/public/build/3675.c3a9877e14ba507c42f3.js %%DATADIR%%/public/build/3675.c3a9877e14ba507c42f3.js.map %%DATADIR%%/public/build/3711.57bcf19ff85eb67f09ad.js @@ -3819,9 +3823,9 @@ bin/grafana-server %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js.LICENSE.txt %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js.map -%%DATADIR%%/public/build/4713.9debbfba7033186a58bf.js -%%DATADIR%%/public/build/4713.9debbfba7033186a58bf.js.LICENSE.txt -%%DATADIR%%/public/build/4713.9debbfba7033186a58bf.js.map +%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js +%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js.LICENSE.txt +%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js.map %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js.LICENSE.txt %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js.map @@ -3885,8 +3889,8 @@ bin/grafana-server %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js.LICENSE.txt %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js.map -%%DATADIR%%/public/build/7062.5ec1c4d918175e7b8ce4.js -%%DATADIR%%/public/build/7062.5ec1c4d918175e7b8ce4.js.map +%%DATADIR%%/public/build/7062.fcada9f7f3d34448f01f.js +%%DATADIR%%/public/build/7062.fcada9f7f3d34448f01f.js.map %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js.LICENSE.txt %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js.map @@ -3938,8 +3942,8 @@ bin/grafana-server %%DATADIR%%/public/build/7978.82e87dd750040fc348d3.js.map %%DATADIR%%/public/build/8074.427c8eb7ecb4f81708cf.js %%DATADIR%%/public/build/8074.427c8eb7ecb4f81708cf.js.map -%%DATADIR%%/public/build/8186.05020a6ae6ca76944bce.js -%%DATADIR%%/public/build/8186.05020a6ae6ca76944bce.js.map +%%DATADIR%%/public/build/8186.809ad54fb93d1e6b8e5e.js +%%DATADIR%%/public/build/8186.809ad54fb93d1e6b8e5e.js.map %%DATADIR%%/public/build/8250.4d38b3d3a4f4d0cd5427.js %%DATADIR%%/public/build/8250.4d38b3d3a4f4d0cd5427.js.map %%DATADIR%%/public/build/8273.e9df3a88af49edf7c7a0.js @@ -4216,14 +4220,14 @@ bin/grafana-server %%DATADIR%%/public/build/lokiPlugin.2c4b4d94e4d7cafc862a.js %%DATADIR%%/public/build/lokiPlugin.2c4b4d94e4d7cafc862a.js.map %%DATADIR%%/public/build/mixedPlugin.d34f3b0fb2ffc4b01ebe.js -%%DATADIR%%/public/build/mssqlPlugin.90b7553fca88f6531052.js -%%DATADIR%%/public/build/mssqlPlugin.90b7553fca88f6531052.js.map -%%DATADIR%%/public/build/mysqlPlugin.70c17a8ea69be486bb00.js -%%DATADIR%%/public/build/mysqlPlugin.70c17a8ea69be486bb00.js.map +%%DATADIR%%/public/build/mssqlPlugin.76f2301a75bb8f45bad1.js +%%DATADIR%%/public/build/mssqlPlugin.76f2301a75bb8f45bad1.js.map +%%DATADIR%%/public/build/mysqlPlugin.c236cae756b3ab66d304.js +%%DATADIR%%/public/build/mysqlPlugin.c236cae756b3ab66d304.js.map %%DATADIR%%/public/build/opentsdbPlugin.8af1ac5ad4a499e0f5cc.js %%DATADIR%%/public/build/opentsdbPlugin.8af1ac5ad4a499e0f5cc.js.map -%%DATADIR%%/public/build/postgresPlugin.0fe841f0c289ee1cf341.js -%%DATADIR%%/public/build/postgresPlugin.0fe841f0c289ee1cf341.js.map +%%DATADIR%%/public/build/postgresPlugin.c2b648ba98875a269b82.js +%%DATADIR%%/public/build/postgresPlugin.c2b648ba98875a269b82.js.map %%DATADIR%%/public/build/prom-query-field.c291116a0d6f1677cf0e.js %%DATADIR%%/public/build/prom-query-field.c291116a0d6f1677cf0e.js.map %%DATADIR%%/public/build/prometheusPlugin.2ec77bbb19477bf09f8e.js @@ -4233,8 +4237,8 @@ bin/grafana-server %%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.7c55da8e027edafb5e7f.js -%%DATADIR%%/public/build/runtime.7c55da8e027edafb5e7f.js.map +%%DATADIR%%/public/build/runtime.98d552444ac85c6a5963.js +%%DATADIR%%/public/build/runtime.98d552444ac85c6a5963.js.map %%DATADIR%%/public/build/scenes.d32cfb92881b6c3671d9.js %%DATADIR%%/public/build/scenes.d32cfb92881b6c3671d9.js.map %%DATADIR%%/public/build/static/img/codicon.b797181c.ttf