From nobody Thu Sep 01 14:46:09 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 4MJP4K6x25z4bpqb; Thu, 1 Sep 2022 14:46:09 +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 4MJP4K5Mbhz3Bw1; Thu, 1 Sep 2022 14:46:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662043569; 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=xWzFIQKUxfFWz7LCnoSEhsijPG2tGoDhBAXBJWhbbNI=; b=Zqv5SDP8F05T48fyCI28moe/7JEmsffVXHRRVtb4cJ8ikvad5CZy+GFnzPzYr258PFdFOh JjD+ODZyDV8BZ6KIewmiy2E/6umF8k+FPJFH9mpp+sbIasFyHK/7BWVj/1NNcjDm+KE8Ke cIIYISbD59laGtTZ7M5SJD9qdqb1w3VYmoSIfC4Ujth68iqO+INJ7Q5eSKR2ORrQKI1Aao kjXzY5ZIEzR1cPOf8c9zhPSQJi0vxVG5qUVvNuK7PzWlpS9uBMT6RLvnwNcnw0z0yCXV8R UrH9elnYFA53oa4GHaN7fm9/DXo8OF48deZT7Smxa5hwn6pP7fuaH1jCY4KnGQ== 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 4MJP4K4S5QzW9Z; Thu, 1 Sep 2022 14:46:09 +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 281Ek9KB019445; Thu, 1 Sep 2022 14:46:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 281Ek9tH019444; Thu, 1 Sep 2022 14:46:09 GMT (envelope-from git) Date: Thu, 1 Sep 2022 14:46:09 GMT Message-Id: <202209011446.281Ek9tH019444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 93c7ec48ee7d - 2022Q3 - www/grafana{8,9}: Update to 8.5.11 and 9.1.2 (Fixes security vulnerability) 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 93c7ec48ee7d82fa41eb15bf94d42751b004dde2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662043569; 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=xWzFIQKUxfFWz7LCnoSEhsijPG2tGoDhBAXBJWhbbNI=; b=Hcv7ryJpJD+PWb3S8SMJnIDhd4WiT+wylEorm0MBHgegWyZOqdTr37NdkD/FsoguaK0lku C6kcK91uzVdz+aaoJmAeR2QHwweZQiojl0bAF6p9PiW9v4SkKnKhFYja+vwIIsr6vDfu4A A8Y9iV9tPn49wZSboA3x+Xts/UybPXLbvb50w+jyMn8Q2Y2ZeoCl0Cx77K9H5aWv1LnBDC ElabCzM3XR1a8QQG8bTH7nYA9es9VNMUBQ/cXb579sYJOgxGF4Y/Q085GyHloSqCVlmvNU VQ3rtFOE2yj5F4tLShcQyeqfdi4lvuYcOZKKbmBIQI28VxEzZ6Wj4lhQGmOOFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662043569; a=rsa-sha256; cv=none; b=H3cCIe0TTNsS4LS/KMBld8fiJHDji+PkNBBoiv2z/XJUAkW+6qlFqlKHjw0l+paUlwjsqa +Rz4DpgaRVB/N/Lhc+gi4HQ6dCosAWGn5Jemp9V1FpQ4/x8TepcoK/BJEbcP6L2KWJhYbF NItwt1DQfA7MlEH1C4KaJr77V9WDHM67x3CbeS0gsxoCr7CohqAq+uS0hWn48VJE3hxIg3 sAjzMcTj7MA6u4tkj+fWT195ugNRpJ2Q3c/WiX0MvY96Jo+ZUcFy9D4MybmXVH9+LMelBE wbtaTc4f/dNezM7ZI/l7wselLAsgpgrx12F5xW/AiYzoz2+KbRFOm8jo5qPSpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=93c7ec48ee7d82fa41eb15bf94d42751b004dde2 commit 93c7ec48ee7d82fa41eb15bf94d42751b004dde2 Author: Boris Korzun AuthorDate: 2022-09-01 11:58:35 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-01 14:45:52 +0000 www/grafana{8,9}: Update to 8.5.11 and 9.1.2 (Fixes security vulnerability) - vuxml: CVE-2022-31176 - Unauthorized file disclosure ChangeLog: https://grafana.com/blog/2022/08/30/security-release-new-versions-of-grafana-and-grafana-image-renderer-with-a-high-severity-security-fix-for-cve-2022-31176/ PR: 266128 MFH: 2022Q3 Security: 827b95ff-290e-11ed-a2e7-6c3be5272acd (cherry picked from commit 6d1286b01d0f921696bf1759af0a6a50d4bdd0c8) --- www/grafana8/Makefile | 4 +-- www/grafana8/Makefile.modules | 30 +++++++++++----------- www/grafana8/distinfo | 58 +++++++++++++++++++++---------------------- www/grafana9/Makefile | 6 ++--- www/grafana9/distinfo | 14 +++++------ www/grafana9/pkg-plist | 42 ++++++++++++++++--------------- 6 files changed, 77 insertions(+), 77 deletions(-) diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile index 29aebc61c867..5aadbddbb12b 100644 --- a/www/grafana8/Makefile +++ b/www/grafana8/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 8.5.10 +DISTVERSION= 8.5.11 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public PKGNAMESUFFIX= ${DISTVERSION:C/([0-9]).*/\1/1} @@ -22,7 +22,7 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 9bdf1b6 +TAG= e93eafb GO_TARGET= ./pkg/cmd/grafana-server \ ./pkg/cmd/grafana-cli diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules index 0eaf7c815618..8935c07877ba 100644 --- a/www/grafana8/Makefile.modules +++ b/www/grafana8/Makefile.modules @@ -1,9 +1,7 @@ MASTER_SITES+= https://gitea.com/xorm/builder/archive/:builder \ - https://gitea.com/xorm/core/archive/:core \ - https://gitea.com/xorm/xorm/archive/:xorm + https://gitea.com/xorm/core/archive/:core DISTFILES+= v0.3.6${EXTRACT_SUFX}:builder \ - v0.7.3${EXTRACT_SUFX}:core \ - v0.8.2${EXTRACT_SUFX}:xorm + v0.7.3${EXTRACT_SUFX}:core GH_TUPLE= \ Azure:azure-sdk-for-go:v59.3.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \ Azure:azure-sdk-for-go:sdk/azcore/v0.22.0:azure_azure_sdk_for_go_sdk_azcore \ @@ -90,29 +88,29 @@ GH_TUPLE= \ go-sourcemap:sourcemap:v2.1.3:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \ go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \ go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \ - go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \ gofrs:uuid:v4.0.0:gofrs_uuid/vendor/github.com/gofrs/uuid \ gogo:googleapis:v1.4.1:gogo_googleapis/vendor/github.com/gogo/googleapis \ gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \ gogo:status:v1.1.0:gogo_status/vendor/github.com/gogo/status \ golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:ae814b36b871:golang_crypto/vendor/golang.org/x/crypto \ - golang:exp:85be41e4509f:golang_exp/vendor/golang.org/x/exp \ + golang:crypto:05595931fe9d:golang_crypto/vendor/golang.org/x/crypto \ + golang:exp:b0d781184e0d:golang_exp/vendor/golang.org/x/exp \ golang:glog:23def4e6c14b:golang_glog/vendor/github.com/golang/glog \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \ golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \ - golang:net:6a13c67c3ce4:golang_net/vendor/golang.org/x/net \ - golang:oauth2:d3ed0bb246c8:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:net:1bab6f366d9e:golang_net/vendor/golang.org/x/net \ + golang:oauth2:fd043fe589d2:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \ - golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ - golang:sys:da31bd327af9:golang_sys/vendor/golang.org/x/sys \ + golang:sync:0de741cfad7f:golang_sync/vendor/golang.org/x/sync \ + golang:sys:bc2c85ada10a:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \ - golang:time:f0f3c7e86c11:golang_time/vendor/golang.org/x/time \ - golang:tools:v0.1.9:golang_tools/vendor/golang.org/x/tools \ + golang:time:579cf78fd858:golang_time/vendor/golang.org/x/time \ + golang:tools:v0.1.11:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ golang-jwt:jwt:v3.2.1:golang_jwt_jwt/vendor/github.com/golang-jwt/jwt \ golang-jwt:jwt:v4.2.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \ @@ -123,7 +121,7 @@ GH_TUPLE= \ google:btree:v1.0.1:google_btree/vendor/github.com/google/btree \ google:flatbuffers:v2.0.0:google_flatbuffers/vendor/github.com/google/flatbuffers \ google:go-cloud:99801bbb523a:google_go_cloud/vendor/gocloud.dev \ - google:go-cmp:v0.5.7:google_go_cmp/vendor/github.com/google/go-cmp \ + google:go-cmp:v0.5.8:google_go_cmp/vendor/github.com/google/go-cmp \ google:go-genproto:81c1377c94b1:google_go_genproto/vendor/google.golang.org/genproto \ google:subcommands:v1.0.1:google_subcommands/vendor/github.com/google/subcommands \ google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \ @@ -139,11 +137,12 @@ GH_TUPLE= \ grafana:dskit:3a88ec0b675f:grafana_dskit/vendor/github.com/grafana/dskit \ grafana:go-mssqldb:d0ce3c521036:grafana_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \ grafana:grafana-aws-sdk:v0.10.3:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \ - grafana:grafana-azure-sdk-go:v1.1.0:grafana_grafana_azure_sdk_go/vendor/github.com/grafana/grafana-azure-sdk-go \ + grafana:grafana-azure-sdk-go:v1.3.0:grafana_grafana_azure_sdk_go/vendor/github.com/grafana/grafana-azure-sdk-go \ grafana:grafana-google-sdk-go:b190293eaf58:grafana_grafana_google_sdk_go/vendor/github.com/grafana/grafana-google-sdk-go \ grafana:grafana-plugin-sdk-go:v0.131.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \ grafana:loki:7832783b1caa:grafana_loki/vendor/github.com/grafana/loki \ grafana:saml:aed1b2edd86b:grafana_saml/vendor/github.com/crewjam/saml \ + grafana:xorm:2fcda7565af6:grafana_xorm/vendor/xorm.io/xorm \ grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ grpc:grpc-go:v1.42.0:grpc_grpc_go/vendor/google.golang.org/grpc \ @@ -286,4 +285,3 @@ deps-post-extract: @${MKDIR} ${WRKSRC}/vendor/xorm.io @${RLN} ${WRKDIR}/builder ${WRKSRC}/vendor/xorm.io/ @${RLN} ${WRKDIR}/core ${WRKSRC}/vendor/xorm.io/ - @${RLN} ${WRKDIR}/xorm ${WRKSRC}/vendor/xorm.io/ diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo index c115e339fe89..4f2bf4ab57b6 100644 --- a/www/grafana8/distinfo +++ b/www/grafana8/distinfo @@ -1,14 +1,12 @@ -TIMESTAMP = 1660201343 -SHA256 (grafana-8.5.10.linux-amd64.tar.gz) = 0a2bf3001d7f066e61106b223ae27916020e8d1b74ab47203b067d51c3aafb44 -SIZE (grafana-8.5.10.linux-amd64.tar.gz) = 77786221 +TIMESTAMP = 1661937381 +SHA256 (grafana-8.5.11.linux-amd64.tar.gz) = 43b6ecbd16ad682712925510c2727a283e5d87e01a1cdf7a1c5f4a9ae74d620b +SIZE (grafana-8.5.11.linux-amd64.tar.gz) = 77781051 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-v8.5.10_GH0.tar.gz) = 7e0d925b9223a2364c3bb8e922b79d3d02aa897dbb8dc89ee985a477ff79dd20 -SIZE (grafana-grafana-v8.5.10_GH0.tar.gz) = 18815565 +SHA256 (grafana-grafana-v8.5.11_GH0.tar.gz) = c21dc4a62cd98005c47d34f265abcfc5b1e5409ce2cb3cbd6703871ac4d856d5 +SIZE (grafana-grafana-v8.5.11_GH0.tar.gz) = 18815380 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 @@ -179,10 +177,10 @@ SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498 SIZE (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168 SHA256 (go-stack-stack-v1.8.0_GH0.tar.gz) = 3b8987e137d76f4f35db1e8005ec7fb766b68eed8cac0ca0b795ac43cd72b319 SIZE (go-stack-stack-v1.8.0_GH0.tar.gz) = 8039 -SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a -SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 +SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5 +SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173 SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962 SHA256 (gofrs-uuid-v4.0.0_GH0.tar.gz) = 7857a4f0c066d2e43a1b7912458b028b6fa351eb1a1d41b022dd6ac347e96b4f @@ -195,10 +193,10 @@ SHA256 (gogo-status-v1.1.0_GH0.tar.gz) = cbc23c8f34b02bec1b034bf80fddb5cd5a44670 SIZE (gogo-status-v1.1.0_GH0.tar.gz) = 9547 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007 -SHA256 (golang-crypto-ae814b36b871_GH0.tar.gz) = 38c8e6160238af56cd465f4e0be5f60cf24888b9957ec6647cbb63978843b1dd -SIZE (golang-crypto-ae814b36b871_GH0.tar.gz) = 1734004 -SHA256 (golang-exp-85be41e4509f_GH0.tar.gz) = 6fb18daada899f426f0b689b00c495035e7dbb9269f4d4d4017a154f9e6c5c8d -SIZE (golang-exp-85be41e4509f_GH0.tar.gz) = 1526135 +SHA256 (golang-crypto-05595931fe9d_GH0.tar.gz) = ce17e1237290dc1666351238e0ab42d2821b0a0bd48490402a1779be82d67910 +SIZE (golang-crypto-05595931fe9d_GH0.tar.gz) = 1631418 +SHA256 (golang-exp-b0d781184e0d_GH0.tar.gz) = 04b6116bd3c4510d77657f116a2ec51e5052378ea3fc8f60ac9d7aa80a96acd6 +SIZE (golang-exp-b0d781184e0d_GH0.tar.gz) = 1556425 SHA256 (golang-glog-23def4e6c14b_GH0.tar.gz) = 528b6072aa1c5dc69325bd6f057940ba8908703542ec5689b64b98e72c48588b SIZE (golang-glog-23def4e6c14b_GH0.tar.gz) = 19660 SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394 @@ -207,24 +205,24 @@ SHA256 (golang-mock-v1.6.0_GH0.tar.gz) = 470174971c3a63361149a30f5b2d3a716a198af SIZE (golang-mock-v1.6.0_GH0.tar.gz) = 69251 SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59 SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751 -SHA256 (golang-net-6a13c67c3ce4_GH0.tar.gz) = 850c25c0f86d8cd15f1ddb2d6ae5488867880e17ee5952667f66a5889ca219bf -SIZE (golang-net-6a13c67c3ce4_GH0.tar.gz) = 1226392 -SHA256 (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 17989d348e2fd423992005229d92c9fc5e25ad5358f72d31361dbf1cdd7c505c -SIZE (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 87604 +SHA256 (golang-net-1bab6f366d9e_GH0.tar.gz) = 77c3fb8854383a68aceb5c36b5613bbdd90462c20d4a23a6d42efb569e10a98b +SIZE (golang-net-1bab6f366d9e_GH0.tar.gz) = 1228310 +SHA256 (golang-oauth2-fd043fe589d2_GH0.tar.gz) = 4e644db6e5d9e1eeabd1f9c5681c42975e8b5d3fd6289d617673542fd88f841b +SIZE (golang-oauth2-fd043fe589d2_GH0.tar.gz) = 90227 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129 -SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda -SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752 -SHA256 (golang-sys-da31bd327af9_GH0.tar.gz) = 0c834c593096084aa9458c2ad0ff9177a6397950f4dc7376c9d67367f0687623 -SIZE (golang-sys-da31bd327af9_GH0.tar.gz) = 1257001 +SHA256 (golang-sync-0de741cfad7f_GH0.tar.gz) = 2fa092fe5edb65287cc57f35d886eca29b47591367bb325769dd78643688e736 +SIZE (golang-sync-0de741cfad7f_GH0.tar.gz) = 19521 +SHA256 (golang-sys-bc2c85ada10a_GH0.tar.gz) = f4a4b0839211cec4a8520bdc7e1004aba8cd0fa1a480a7158d1276efeb890e9a +SIZE (golang-sys-bc2c85ada10a_GH0.tar.gz) = 1303050 SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26 SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718 -SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53 -SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626 -SHA256 (golang-tools-v0.1.9_GH0.tar.gz) = 21ea4ee3971ae00c0d1e9a9e8b658ae638dd7292a974dad7da15f1fa8967c8bc -SIZE (golang-tools-v0.1.9_GH0.tar.gz) = 2939407 +SHA256 (golang-time-579cf78fd858_GH0.tar.gz) = ea2b6419aec8aafa880052490b137a9d50fe4ff9a10871d402c92cb7a582d035 +SIZE (golang-time-579cf78fd858_GH0.tar.gz) = 11016 +SHA256 (golang-tools-v0.1.11_GH0.tar.gz) = 27d5d4c897b216b73169c88841035f0cb369ece9ee67bcf3355f065cdaad2918 +SIZE (golang-tools-v0.1.11_GH0.tar.gz) = 3078603 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 SHA256 (golang-jwt-jwt-v3.2.1_GH0.tar.gz) = 9c7d8c881a6517a7d38276d5cbcfbef93ff7ebb7d43181c471d9dc05b0b8feed @@ -245,8 +243,8 @@ SHA256 (google-flatbuffers-v2.0.0_GH0.tar.gz) = 9ddb9031798f4f8754d00fca2f1a68ec SIZE (google-flatbuffers-v2.0.0_GH0.tar.gz) = 1538022 SHA256 (google-go-cloud-99801bbb523a_GH0.tar.gz) = c00d52b97ab7f6d61e149f64723c019ea828600c5931ef79995df3aaec29e990 SIZE (google-go-cloud-99801bbb523a_GH0.tar.gz) = 3365526 -SHA256 (google-go-cmp-v0.5.7_GH0.tar.gz) = 70c779a3f2625d7ab5a427b4244b93c2e6a8d1cd779c182fc4fad7ff864a4fb2 -SIZE (google-go-cmp-v0.5.7_GH0.tar.gz) = 104499 +SHA256 (google-go-cmp-v0.5.8_GH0.tar.gz) = 34b57f44eb6ead7de4988fd91a8605f77ecb4a430ddbba36bada0d0224017222 +SIZE (google-go-cmp-v0.5.8_GH0.tar.gz) = 104647 SHA256 (google-go-genproto-81c1377c94b1_GH0.tar.gz) = 90876687d67e4831319edd6a91ab67ae31b654103e36971ca922363941880356 SIZE (google-go-genproto-81c1377c94b1_GH0.tar.gz) = 12125189 SHA256 (google-subcommands-v1.0.1_GH0.tar.gz) = 7ddd3eac82240ce08b75f9b03ff50483e121329517d9c20570207aaddfeff14f @@ -277,8 +275,8 @@ SHA256 (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = a3a62b4964fee10a698852dea6 SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960 SHA256 (grafana-grafana-aws-sdk-v0.10.3_GH0.tar.gz) = 4ad3fae37fd4ac100afe213394c0c68eb632cca5d8f34b8c15fbe93f855bb43b SIZE (grafana-grafana-aws-sdk-v0.10.3_GH0.tar.gz) = 50884 -SHA256 (grafana-grafana-azure-sdk-go-v1.1.0_GH0.tar.gz) = 5353a4c569bc164f49a897ca3312e6ceeda7f021b179a4b6c3d02c2cfe4b27f2 -SIZE (grafana-grafana-azure-sdk-go-v1.1.0_GH0.tar.gz) = 14145 +SHA256 (grafana-grafana-azure-sdk-go-v1.3.0_GH0.tar.gz) = 717fe73de4390347923bd29ca4dc8d34ebe908b454e57eb1df9109943613203f +SIZE (grafana-grafana-azure-sdk-go-v1.3.0_GH0.tar.gz) = 15893 SHA256 (grafana-grafana-google-sdk-go-b190293eaf58_GH0.tar.gz) = fee5fbb589f714cdc5f11b032d7df59f35e90801931bca0a9a4c0957ef368a9f SIZE (grafana-grafana-google-sdk-go-b190293eaf58_GH0.tar.gz) = 35355 SHA256 (grafana-grafana-plugin-sdk-go-v0.131.0_GH0.tar.gz) = 2c26090b753aaa8b01c265c24c9ba12e268fad12da07efd12239992df01ed8b2 @@ -287,6 +285,8 @@ SHA256 (grafana-loki-7832783b1caa_GH0.tar.gz) = e89867b5a7b0e8d40d43d355a6292ac0 SIZE (grafana-loki-7832783b1caa_GH0.tar.gz) = 26035626 SHA256 (grafana-saml-aed1b2edd86b_GH0.tar.gz) = 980899519b1e4c9d03be608c48793c12e197d7e73438ca2b27533dbe1c5486c4 SIZE (grafana-saml-aed1b2edd86b_GH0.tar.gz) = 252303 +SHA256 (grafana-xorm-2fcda7565af6_GH0.tar.gz) = f9ef23a67e683ef3153425856c9e71d38c584e76320a174f296e80774659af28 +SIZE (grafana-xorm-2fcda7565af6_GH0.tar.gz) = 414050 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 SHA256 (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = e37a815659a20ccb6baf26a48cc51efe39b9651ceb0857178f6f2eaa2c47ae75 diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile index 55d0b1ebf86a..a20bd57f17c0 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 9.1.1 +DISTVERSION= 9.1.2 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/:public \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod @@ -24,7 +24,7 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 9e60a1b +TAG= 3c13120 GO_MODULE= github.com/grafana/grafana GO_TARGET= ./pkg/cmd/grafana-server \ @@ -92,7 +92,7 @@ post-install: ${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf ${MKDIR} ${STAGEDIR}${GRAFANA_DATADIR} ${MKDIR} ${STAGEDIR}${GRAFANA_PLUGINDIR} -.for dir in access-control dashboards datasources notifiers plugins +.for dir in access-control alerting dashboards datasources notifiers plugins ${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir} .endfor ${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR} diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo index e4486f909d22..8b9babd847f4 100644 --- a/www/grafana9/distinfo +++ b/www/grafana9/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1661329185 -SHA256 (go/www_grafana9/grafana-grafana-v9.1.1_GH0/grafana-9.1.1.linux-amd64.tar.gz) = c356a5a39ecd3ec26da0cfbb4276de53c1c206e6e2f600e64c995bc5d9da7e74 -SIZE (go/www_grafana9/grafana-grafana-v9.1.1_GH0/grafana-9.1.1.linux-amd64.tar.gz) = 80925510 -SHA256 (go/www_grafana9/grafana-grafana-v9.1.1_GH0/go.mod) = 30166787a37273552b62ff68af652c6cf4e28e91b2312b69af6c3c765b2d6231 -SIZE (go/www_grafana9/grafana-grafana-v9.1.1_GH0/go.mod) = 17684 -SHA256 (go/www_grafana9/grafana-grafana-v9.1.1_GH0/grafana-grafana-v9.1.1_GH0.tar.gz) = 2433bf28b2667e9d5f805993ee38d71a108dd46938c5c5aa44dda6905eab9dde -SIZE (go/www_grafana9/grafana-grafana-v9.1.1_GH0/grafana-grafana-v9.1.1_GH0.tar.gz) = 23643284 +TIMESTAMP = 1661937351 +SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-9.1.2.linux-amd64.tar.gz) = 3b082a5cc372eb916d0c97130eb7deddafaae0aef4a7fdfcd23400c5ca26d52e +SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-9.1.2.linux-amd64.tar.gz) = 80934170 +SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/go.mod) = 30166787a37273552b62ff68af652c6cf4e28e91b2312b69af6c3c765b2d6231 +SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/go.mod) = 17684 +SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-grafana-v9.1.2_GH0.tar.gz) = 6d15ba3e34c9dd26d1fdf6358e4e02b06b82fa6abea26029df0f2f6f890ba5fd +SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-grafana-v9.1.2_GH0.tar.gz) = 23647931 diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist index e8430558c3c4..9ea34c489a71 100644 --- a/www/grafana9/pkg-plist +++ b/www/grafana9/pkg-plist @@ -2440,6 +2440,7 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.test.ts %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts +%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/tracking.ts %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/index.ts %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/logAnalyticsMetadata.ts %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/query.ts @@ -3494,9 +3495,6 @@ bin/grafana-server %%DATADIR%%/public/build/1011.16526cfdc6ca6f23472d.js %%DATADIR%%/public/build/1011.16526cfdc6ca6f23472d.js.LICENSE.txt %%DATADIR%%/public/build/1011.16526cfdc6ca6f23472d.js.map -%%DATADIR%%/public/build/1173.9436c9585f818b85f4c2.js -%%DATADIR%%/public/build/1173.9436c9585f818b85f4c2.js.LICENSE.txt -%%DATADIR%%/public/build/1173.9436c9585f818b85f4c2.js.map %%DATADIR%%/public/build/1204.81bb48e97eab63fc5554.js %%DATADIR%%/public/build/1204.81bb48e97eab63fc5554.js.LICENSE.txt %%DATADIR%%/public/build/1204.81bb48e97eab63fc5554.js.map @@ -3646,8 +3644,6 @@ bin/grafana-server %%DATADIR%%/public/build/4536.1b1b9eca3a0f188c77dc.js %%DATADIR%%/public/build/4536.1b1b9eca3a0f188c77dc.js.LICENSE.txt %%DATADIR%%/public/build/4536.1b1b9eca3a0f188c77dc.js.map -%%DATADIR%%/public/build/4550.7d4e839dfb1dffbc8f6e.js -%%DATADIR%%/public/build/4550.7d4e839dfb1dffbc8f6e.js.map %%DATADIR%%/public/build/4602.b92152b6e3b372abc5dc.js %%DATADIR%%/public/build/4602.b92152b6e3b372abc5dc.js.LICENSE.txt %%DATADIR%%/public/build/4602.b92152b6e3b372abc5dc.js.map @@ -3662,8 +3658,8 @@ bin/grafana-server %%DATADIR%%/public/build/4833.e49e07b89a97cb53c469.js %%DATADIR%%/public/build/4833.e49e07b89a97cb53c469.js.LICENSE.txt %%DATADIR%%/public/build/4833.e49e07b89a97cb53c469.js.map -%%DATADIR%%/public/build/516.3370e2750e5770cd54cb.js -%%DATADIR%%/public/build/516.3370e2750e5770cd54cb.js.map +%%DATADIR%%/public/build/516.8bdd0cc09b6dcbd4bb6a.js +%%DATADIR%%/public/build/516.8bdd0cc09b6dcbd4bb6a.js.map %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.LICENSE.txt %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.map @@ -3685,11 +3681,16 @@ bin/grafana-server %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js.LICENSE.txt %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js.map +%%DATADIR%%/public/build/6151.e6d8219d85d0941f9bf8.js +%%DATADIR%%/public/build/6151.e6d8219d85d0941f9bf8.js.LICENSE.txt +%%DATADIR%%/public/build/6151.e6d8219d85d0941f9bf8.js.map %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.LICENSE.txt %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.map %%DATADIR%%/public/build/6324.4a3c3887825551a24ebd.js %%DATADIR%%/public/build/6324.4a3c3887825551a24ebd.js.map +%%DATADIR%%/public/build/6350.08edb0f977ea5320f9c4.js +%%DATADIR%%/public/build/6350.08edb0f977ea5320f9c4.js.map %%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js %%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js.LICENSE.txt %%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js.map @@ -3780,8 +3781,8 @@ bin/grafana-server %%DATADIR%%/public/build/832.1bbcc6420497d432a98b.js %%DATADIR%%/public/build/832.1bbcc6420497d432a98b.js.LICENSE.txt %%DATADIR%%/public/build/832.1bbcc6420497d432a98b.js.map -%%DATADIR%%/public/build/8626.96faf96fa79d9d52998e.js -%%DATADIR%%/public/build/8626.96faf96fa79d9d52998e.js.map +%%DATADIR%%/public/build/8626.76a448a51b23add1ee93.js +%%DATADIR%%/public/build/8626.76a448a51b23add1ee93.js.map %%DATADIR%%/public/build/865.6a351d4c8e1788389d2b.js %%DATADIR%%/public/build/865.6a351d4c8e1788389d2b.js.LICENSE.txt %%DATADIR%%/public/build/865.6a351d4c8e1788389d2b.js.map @@ -3810,9 +3811,9 @@ bin/grafana-server %%DATADIR%%/public/build/9104.3297bebfa2c9f0ee286b.js %%DATADIR%%/public/build/9104.3297bebfa2c9f0ee286b.js.LICENSE.txt %%DATADIR%%/public/build/9104.3297bebfa2c9f0ee286b.js.map -%%DATADIR%%/public/build/9137.f075e1d92c723d7709ef.js -%%DATADIR%%/public/build/9137.f075e1d92c723d7709ef.js.LICENSE.txt -%%DATADIR%%/public/build/9137.f075e1d92c723d7709ef.js.map +%%DATADIR%%/public/build/9137.d7fb8ff029fa51328905.js +%%DATADIR%%/public/build/9137.d7fb8ff029fa51328905.js.LICENSE.txt +%%DATADIR%%/public/build/9137.d7fb8ff029fa51328905.js.map %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js.LICENSE.txt %%DATADIR%%/public/build/9179.1ed7b3bb5070f7d631f6.js.map @@ -3889,8 +3890,8 @@ bin/grafana-server %%DATADIR%%/public/build/DashboardImport.4173336038c91a0b172c.js.map %%DATADIR%%/public/build/DashboardListPage.0099be6c25a1c7f4ed52.js %%DATADIR%%/public/build/DashboardListPage.0099be6c25a1c7f4ed52.js.map -%%DATADIR%%/public/build/DashboardPage.a8ba8795a020dda3a90d.js -%%DATADIR%%/public/build/DashboardPage.a8ba8795a020dda3a90d.js.map +%%DATADIR%%/public/build/DashboardPage.5bbef957f179b0dccbbf.js +%%DATADIR%%/public/build/DashboardPage.5bbef957f179b0dccbbf.js.map %%DATADIR%%/public/build/DataConnectionsPage.8a67a2237493ec4b0246.js %%DATADIR%%/public/build/DataConnectionsPage.8a67a2237493ec4b0246.js.map %%DATADIR%%/public/build/DataSourceDashboards.010ef8fb1a8393c5f104.js @@ -3987,8 +3988,8 @@ bin/grafana-server %%DATADIR%%/public/build/UsersListPage.2a220612f75819771aab.js.map %%DATADIR%%/public/build/alertmanagerPlugin.8396ac3a4a41b26a621a.js %%DATADIR%%/public/build/alertmanagerPlugin.8396ac3a4a41b26a621a.js.map -%%DATADIR%%/public/build/app.f03d0b85c5bc1584000c.js -%%DATADIR%%/public/build/app.f03d0b85c5bc1584000c.js.map +%%DATADIR%%/public/build/app.2e869d22a62a3c00d02d.js +%%DATADIR%%/public/build/app.2e869d22a62a3c00d02d.js.map %%DATADIR%%/public/build/azureMonitorPlugin.93e9bbeebabd360f746b.js %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js.map @@ -4000,8 +4001,8 @@ bin/grafana-server %%DATADIR%%/public/build/cloudwatchPlugin.81508f2e56a904a5857f.js %%DATADIR%%/public/build/cloudwatchPlugin.81508f2e56a904a5857f.js.map %%DATADIR%%/public/build/dark.fa07f40772cfbfcc2378.js -%%DATADIR%%/public/build/elasticsearchPlugin.6ad792a54585088ff011.js -%%DATADIR%%/public/build/elasticsearchPlugin.6ad792a54585088ff011.js.map +%%DATADIR%%/public/build/elasticsearchPlugin.3828bbf3c8bcb5f0a0d5.js +%%DATADIR%%/public/build/elasticsearchPlugin.3828bbf3c8bcb5f0a0d5.js.map %%DATADIR%%/public/build/explore-feature-toggle-page.b8b746f6de1cca70d16b.js %%DATADIR%%/public/build/explore-feature-toggle-page.b8b746f6de1cca70d16b.js.map %%DATADIR%%/public/build/explore.fb593d6b1bcd93e66c3c.js @@ -4048,8 +4049,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.fe65622f1fd3e8e05441.js -%%DATADIR%%/public/build/runtime.fe65622f1fd3e8e05441.js.map +%%DATADIR%%/public/build/runtime.039659ce7c5e02f11df5.js +%%DATADIR%%/public/build/runtime.039659ce7c5e02f11df5.js.map %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js.map %%DATADIR%%/public/build/static/img/codicon.56dba998.ttf @@ -6224,6 +6225,7 @@ bin/grafana-server @dir %%GRAFANA_PLUGINDIR%% @dir %%GRAFANA_PROVISIONINGDIR%% @dir %%GRAFANA_PROVISIONINGDIR%%/access-control +@dir %%GRAFANA_PROVISIONINGDIR%%/alerting @dir %%GRAFANA_PROVISIONINGDIR%%/dashboards @dir %%GRAFANA_PROVISIONINGDIR%%/datasources @dir %%GRAFANA_PROVISIONINGDIR%%/notifiers