From 7e04dcab8a17153ba676e61db6841952c392d799 Mon Sep 17 00:00:00 2001
From: Sam Feifer <sfeifer@redhat.com>
Date: Tue, 2 Dec 2025 11:46:26 -0500
Subject: [PATCH] Resolves: RHEL-125629

fix recursive definition of gotestflags macro
---
 grafana.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grafana.spec b/grafana.spec
index eb2b8fc..38e6fe1 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -19,13 +19,14 @@
 end}
 
 %global gomodulesmode GO111MODULE=auto
-%global gotestflags   %{gotestflags} -tags=integration
+%global _gotestflags_save %{?gotestflags}
+%global gotestflags %{?_gotestflags_save} -tags=integration
 
 %global selinux_variants mls targeted
 
 Name:             grafana
 Version:          10.2.6
-Release:          20%{?dist}
+Release:          22%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPL-3.0-only
 URL:              https://grafana.org
@@ -1016,6 +1017,9 @@ done
 %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana
 
 %changelog
+* Mon Dec 1 2025 Sam Feifer <sfeifer@redhat.com> 10.2.6-22
+- Resolves RHEL-125629: CVE-2025-58183
+
 * Wed Jun 18 2025 Sam Feifer <sfeifer@redhat.com> 10.2.6-20
 - Resolves RHEL-97520: Rework grafana-selinux spec file sections
 - Resolves RHEL-92648: Add additional SELinux rules for grafana-selinux package to allow LDAP connections