public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sam Feifer <sfeifer@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/grafana] rawhide: fix patch 1002 for newer golang
Date: Mon, 01 Jun 2026 16:20:57 GMT [thread overview]
Message-ID: <178033085716.1.3594240774193629901.rpms-grafana-8bfffc422841@fedoraproject.org> (raw)
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)
reply other threads:[~2026-06-01 16:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178033085716.1.3594240774193629901.rpms-grafana-8bfffc422841@fedoraproject.org \
--to=sfeifer@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox