Fix issue with fips on behalf of @andrewimeson (#4622)

grafana · Jul 27, 2023 · 234b056 · 234b056
1 parent 3837d47
commit 234b056
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,8 @@ Main (unreleased)
   was rolled back, resulting in "dropped sample for series that was not
   explicitly dropped via relabelling" log messages. (@rfratto)
 
+- Fix RPM file digests so that installation on FIPS-enabled systems succeeds. (@andrewimeson)
+
 ### Other changes
 
 - Compile journald support into builds of `grafana-agentctl` so

diff --git a/packaging/grafana-agent-flow/rpm/gpg-sign.sh b/packaging/grafana-agent-flow/rpm/gpg-sign.sh
@@ -18,6 +18,7 @@ echo "%_gpg_name Grafana Labs <[email protected]>
 %_gpg_path /root/.gnupg
 %_gpgbin /usr/bin/gpg
 %_gpg_digest_algo sha256
+%_binary_filedigest_algorithm 8
 %__gpg /usr/bin/gpg
 %__gpg_sign_cmd     %{__gpg} \
          gpg --no-tty --batch --yes --no-verbose --no-armor \

diff --git a/packaging/grafana-agent/rpm/gpg-sign.sh b/packaging/grafana-agent/rpm/gpg-sign.sh
@@ -18,6 +18,7 @@ echo "%_gpg_name Grafana Labs <[email protected]>
 %_gpg_path /root/.gnupg
 %_gpgbin /usr/bin/gpg
 %_gpg_digest_algo sha256
+%_binary_filedigest_algorithm 8
 %__gpg /usr/bin/gpg
 %__gpg_sign_cmd     %{__gpg} \
          gpg --no-tty --batch --yes --no-verbose --no-armor \