From nobody Thu Apr 24 17:01:13 2025 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 4Zk2LK5CyVz5tY2b; Thu, 24 Apr 2025 17:01:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zk2LK3Yltz3l9G; Thu, 24 Apr 2025 17:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745514073; 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=ts9bsQg8TZftF5Zhgmray2FWXN1bxXikVNTU5Vhk9Lo=; b=sYtItX2rX6+Hnq4/RA/MYHD626KSPuS3gbMTh+hstTfqwfwY0nNg+C9LSLr/mRkXQvcDbO TsAhfNPu20RMmVyShOZasudE9DS3ZgBU8J4sYUaQ+GqV5I4adEVGPtCNagotFMVZUyMfVy uD0MHzYPaLUWuCu/AvKFWBhLnz9BO5757kuj1WBnQ8bY6g3VU5+XA7R2GcGgJFYH3abXX6 s7O8UCNueZ23gotuRhhyZI0I3LeKrpKoljNoQQNKAtsDBIavdiEBmyhbNWQY85+M9h8aaZ jcxzH+l9WpvhKnGlR3ykuHx2dyHbJ4GolCtpDC+FxOorRBC4EX30poF047Ga1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745514073; a=rsa-sha256; cv=none; b=rDcUisjcaV+NJlQM1vPeDnhBhCBJDcHeCHYbYl2nr2j5tKWgsk1iqQKb86YPxvJL8auZFt uO83NfDwuHBc2kIwhLa50mSbvQH76BPMM0tmimmigt8mflZTr431Q8Z8LnTr1rOaGmFuOU q7YTb6Qq8AUfuuAcPs7TYouol/KEWVqnrl1RRDFGDv73FR2bWDwIOsTBUYJbc8viSJ2tgy SXgpk6povuFVmE4LBNqVzgM9fn308Ro9onjNdijDozLS7uI3sntMBqoCfc3U3Dp2V3/eGC mQ917iVzYlNisYm63tbrqyZeeuQkBhnRQGOYwYem7Sk4M/+4T4BBHKZMNtvAvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745514073; 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=ts9bsQg8TZftF5Zhgmray2FWXN1bxXikVNTU5Vhk9Lo=; b=MfqE6A5Ko+I0FSyIe9Mr1o1S+h/xZsxSGfpZaon7m82tYFcyq/wvvS4j0qK8KtaygykabH 6clfOpYfjvg+NdMBIRrzlF9y5DJiDHrt4sLlTXk/XNcVxpcHATwYKO4e+M0Zsz0CuP0SDG aBFyyLXkaTvBUhZwk86+EBH28WUTYT2RbKwvU1jRuKBkZ3LbDFsw3jevnX367acnofks+B GDkMw3XsE5Scr2DOs55p97vcHwKTxyJbQlkK6gthK8ZqE6ShXcMp/XEPEf70PNd81KvbED RJ8F1eKpl/sF7o9xlqoHacWr6Pk+D7rVO3pYeBG69XeFAkNmwoKzoCZpBPby5A== 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 4Zk2LK38dszyTb; Thu, 24 Apr 2025 17:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53OH1Dou051050; Thu, 24 Apr 2025 17:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OH1DHU051047; Thu, 24 Apr 2025 17:01:13 GMT (envelope-from git) Date: Thu, 24 Apr 2025 17:01:13 GMT Message-Id: <202504241701.53OH1DHU051047@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 0bd67fe7a36b - 2025Q2 - www/grafana: Update 11.6.0 => 11.6.1 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q2 X-Git-Reftype: branch X-Git-Commit: 0bd67fe7a36b3a9903fbd1c9f6e5094071ba660b Auto-Submitted: auto-generated The branch 2025Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd67fe7a36b3a9903fbd1c9f6e5094071ba660b commit 0bd67fe7a36b3a9903fbd1c9f6e5094071ba660b Author: Boris Korzun AuthorDate: 2025-04-24 16:35:57 +0000 Commit: Vladimir Druzenko CommitDate: 2025-04-24 17:00:57 +0000 www/grafana: Update 11.6.0 => 11.6.1 Changelog: https://github.com/grafana/grafana/releases/tag/v11.6.1 CVEs fixed: * CVE-2025-2703 - DOM XSS vulnerability (Medium) * CVE-2025-3260 - Bypass Viewer and Editor permission (High) * CVE-2025-3454 - Authorization bypass in data source proxy API (Medium) https://grafana.com/blog/2025/04/22/grafana-security-release-medium-and-high-severity-fixes-for-cve-2025-3260-cve-2025-2703-cve-2025-3454/ PR: 286323 Security: CVE-2025-2703 Security: CVE-2025-3260 Security: CVE-2025-3454 MFH: 2025Q2 (cherry picked from commit 090b96f085d03e6a7b88ad257e6daf1e5afc6019) --- www/grafana/Makefile | 6 ++-- www/grafana/distinfo | 82 ++++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/www/grafana/Makefile b/www/grafana/Makefile index 657a392b7bda..0dd96cfe8e72 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 11.6.0 +DISTVERSION= 11.6.1 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/ \ https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod @@ -37,12 +37,12 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 riscv64 RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -USES= cpe go:1.23,modules +USES= cpe go:1.24,modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= d2fdff9 +TAG= ae23ead GO_MODULE= github.com/grafana/grafana GO_MOD_DIST= github diff --git a/www/grafana/distinfo b/www/grafana/distinfo index e4d6d08b74cb..1aa24ff481fe 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,41 +1,41 @@ -TIMESTAMP = 1742976032 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-11.6.0.linux-amd64.tar.gz) = 043fa7b8c634ff060a70e2d069d0beee9300e5b259d8125c456d6b8cae35169f -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-11.6.0.linux-amd64.tar.gz) = 177393269 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.mod) = 7789e209139eded6c4a2fc389a4bcb03fef490005d83b6b0c7f5eea0d13130ae -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.mod) = 37750 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.work) = d866ccf50a182cafb744cbceb2fc4bc33a24b1446b3f162c7db207814ea40335 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.work) = 1462 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/advisor/go.mod) = 7d7bb89246fd2953889480c91e5d2738867008babd5c9c5bc18e4a88253e997a -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/advisor/go.mod) = 4058 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/alerting/notifications/go.mod) = a6f8409ee1c0f3b093eb2e1de5c8f060efde365117ed4ec3efafa413702af167 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/alerting/notifications/go.mod) = 4797 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/investigations/go.mod) = ddba05fa3fd7893513c4a748736110f923a57fe0b338bdb733105cbcbf2c9b84 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/investigations/go.mod) = 4257 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/playlist/go.mod) = 45af00281f9733a55e020b7657edaaf58c5edf95a8cb33db9fc1a15ea3889970 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/playlist/go.mod) = 4239 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/aggregator/go.mod) = 28be0dea834b6b7a0b7322831513d9a543b52e0d9fc031dd63723560ed52eb72 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/aggregator/go.mod) = 8280 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apimachinery/go.mod) = a6dad1958ddcd34a7a5be193924259d7e6c3e2ba2386e0d4db4dc80d85d17f97 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apimachinery/go.mod) = 2516 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apiserver/go.mod) = 26a5d8343979bcb0234aaf3bd99d582e57b94ee20441d6fa414a1e8b200f90a8 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apiserver/go.mod) = 5052 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/go.mod) = 3ae1786b4e3846d0b560a307626d5d2179f1cff4936140176d14bd8d15a30491 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/go.mod) = 7764 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/wire/go.mod) = ad054d77f0f72d63735930a75e17f4d05d7d32ac5f5891397e39430042537bc3 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/wire/go.mod) = 330 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/codegen/go.mod) = 735defe81e70a06b62511c8f5c3b602ce86a23ef23dd651056f4085cf89d8d5e -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/codegen/go.mod) = 2437 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/plugins/codegen/go.mod) = e8f55a48609d6ed1f1cc42333cdaa7243d2a375c135f50a621298a73a49d1594 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/plugins/codegen/go.mod) = 2233 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/promlib/go.mod) = e4fc8480f1c6f284730dccb6600074fd46adaee1e3feeb5096a3e7202e71ada6 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/promlib/go.mod) = 6812 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/semconv/go.mod) = 5f56ec9b5fbb263d3b7d025ea21ae61e2a71ae8703f65acf0038cf58467366e8 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/semconv/go.mod) = 314 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/apistore/go.mod) = 5c4fa4c1f6efce3bceaff72d154099932c703982631a448e64f4bc15bfb7f321 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/apistore/go.mod) = 23405 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/resource/go.mod) = 15a604f841bf3a0652ef41ec779c64ee398d76af50372804d5d830f19d3d10a2 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/resource/go.mod) = 14537 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/util/xorm/go.mod) = d45096480e4d31e06c534befcded3bdebcfb06f906aa569c341dab9e7f9b1686 -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/util/xorm/go.mod) = 3150 -SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-grafana-v11.6.0_GH0.tar.gz) = 8077170956237668050914bd9583582c1592629081e1281845b76ed441a6976e -SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-grafana-v11.6.0_GH0.tar.gz) = 36530317 +TIMESTAMP = 1745492346 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-11.6.1.linux-amd64.tar.gz) = 35a5efca8c535ce961217765faf8d6895c6d1c1587eaeec50d606a5cb218603b +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-11.6.1.linux-amd64.tar.gz) = 178027958 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.mod) = 91c7674d10c8814d15ada1bad9d1bd41c0c5e8969c5e5da1da5be85d33fe49d8 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.mod) = 37750 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.work) = 91abc49021e028c3c2a4736a1c91e473d980ae1c7540138f9e1f436a62329a81 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.work) = 1462 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/advisor/go.mod) = 6c61070df4915b2e6fb69f557bd105c760b941acadd3c66f3fcd57bf7d4d1585 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/advisor/go.mod) = 4058 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/alerting/notifications/go.mod) = 124a37f4bdb7a567d3a511767c1638496ecc5a1dd5f97633fcba7155faf52df6 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/alerting/notifications/go.mod) = 4797 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/investigations/go.mod) = 3c3fe091bb7aed6c745175e21ccb3e961a81f0653a84a97d7ac696258f8108c4 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/investigations/go.mod) = 4257 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/playlist/go.mod) = 8a5d285defd20e31ef83b1263e79762cdd08fe9f1e688830bdad1644279a68cd +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/playlist/go.mod) = 4239 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/aggregator/go.mod) = c316078737a7666ce9cf0da5f7f7d107ade730adbbe5752732d74899c2d38b31 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/aggregator/go.mod) = 8280 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apimachinery/go.mod) = b1b10d93f324e13169864fe92a6d93b0fb23614a6c645775d75c56d311fc3c87 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apimachinery/go.mod) = 2516 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apiserver/go.mod) = 4400608ae4eb0546c1918324a44f7c5f6b35fcb545756fd170fc8de9be3b83d4 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apiserver/go.mod) = 5052 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/go.mod) = ec5a5dac4253889681f8888b61ad5d5059a855d72aa82dd5bcaeb80ab91101c9 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/go.mod) = 7764 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/wire/go.mod) = fbc23dcc413d6b1fa9ab71380da68211859df0e155165d4aabcf557499fb6cf6 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/wire/go.mod) = 330 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/codegen/go.mod) = 7eeccc07ccb7293e6051f207882ea8c9f22199b886acebbc41b6459b651904e5 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/codegen/go.mod) = 2437 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/plugins/codegen/go.mod) = 6ee06b09fab35cc0a7d99cd955d770c820b2b9c1f4cfaec53d1127302b22597e +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/plugins/codegen/go.mod) = 2233 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/promlib/go.mod) = 3d788d99106f6c4aebc9d5e5feb1eb8c52ae1504fc6224e4bf0af8f5026568fe +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/promlib/go.mod) = 6861 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/semconv/go.mod) = 102611f5bece34904bdb7928b7a852764ffb36bc25efb8ce69673a5d61ce1a86 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/semconv/go.mod) = 314 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/apistore/go.mod) = ac17130a28f32539688a7650c734d1b84ef5c01489c89c148b7b79a0a89746f1 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/apistore/go.mod) = 23405 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/resource/go.mod) = 15915ab2954992958d66bbded2270f043994ba6ea868720fa6d3f2d9788acc33 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/resource/go.mod) = 14537 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/util/xorm/go.mod) = fd0137d7c79a69fe252bde216f0f8146fbb301e344fb4f2a4c444d6379da9cb5 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/util/xorm/go.mod) = 3150 +SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-grafana-v11.6.1_GH0.tar.gz) = 1435ba4b47d22f906495c3f53be9f416a721b5b0ca0621533393130fff87aa73 +SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-grafana-v11.6.1_GH0.tar.gz) = 36539394