public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/grafana] rawhide: fix patch 1002 for newer golang
@ 2026-06-01 16:20 Sam Feifer
  0 siblings, 0 replies; only message in thread
From: Sam Feifer @ 2026-06-01 16:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/grafana
Branch : rawhide
Commit : 8bfffc422841c8205073aa7b645661c655cbdcad
Author : Sam Feifer <sfeifer@redhat.com>
Date   : 2026-06-01T12:20:47-04:00
Stats  : +11/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/grafana/c/8bfffc422841c8205073aa7b645661c655cbdcad?branch=rawhide

Log:
fix patch 1002 for newer golang

---
diff --git a/1002-vendor-use-pbkdf2-from-OpenSSL.patch b/1002-vendor-use-pbkdf2-from-OpenSSL.patch
index df6e54a..f02355c 100644
--- a/1002-vendor-use-pbkdf2-from-OpenSSL.patch
+++ b/1002-vendor-use-pbkdf2-from-OpenSSL.patch
@@ -4,6 +4,13 @@ This patch modifies the x/crypto/pbkdf2 function to use OpenSSL
 if FIPS mode is enabled.
 DEFINEFUNC is from /usr/lib/golang/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
 
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -1,2 +1,3 @@
+ golang.org/x/crypto/internal/alias
++golang.org/x/crypto/internal/boring
+ golang.org/x/crypto/internal/poly1305
 diff --git a/vendor/golang.org/x/crypto/internal/boring/boring.go b/vendor/golang.org/x/crypto/internal/boring/boring.go
 new file mode 100644
 index 0000000000..5a06918832

diff --git a/grafana.spec b/grafana.spec
index adeab3d..ddd2cf7 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -26,7 +26,7 @@ end}
 
 Name:             grafana
 Version:          12.4.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPL-3.0-only
 URL:              https://grafana.org
@@ -1153,6 +1153,9 @@ done
 %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana
 
 %changelog
+* Mon Jun 1 2026 Sam Feifer <sfeifer@redhat.com> - 12.4.3-2
+- Fix patch 1002 to work with newer golang versions
+
 * Thu Apr 16 2026 Sam Feifer <sfeifer@redhat.com> - 12.4.3-1
 - Fix bundled plugins issue from rebase to 12.4.2
 - Remove forbidden unicode code point (issue reported by rpminspect)

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-01 16:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-01 16:20 [rpms/grafana] rawhide: fix patch 1002 for newer golang Sam Feifer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox