Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sign rpms with sha256 #4791

Merged
merged 5 commits into from
Aug 14, 2023
Merged

Sign rpms with sha256 #4791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f2f531
add sha256 to all the things
mattdurham Aug 11, 2023
681ac58
update flow
mattdurham Aug 14, 2023
e919874
update changelog
mattdurham Aug 14, 2023
a33ee04
mergE
mattdurham Aug 14, 2023
3472676
Use consistent flags
mattdurham Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ Main (unreleased)

- Fix issue where corrupt WAL segments lead to crash looping. (@tpaschalis)

- Sign RPMs with SHA256 for FIPs compatbility. (@mattdurham)

v0.35.3 (2023-08-09)
--------------------

Expand Down
5 changes: 3 additions & 2 deletions packaging/grafana-agent-flow/rpm/gpg-sign.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ echo "%_gpg_name Grafana Labs <[email protected]>
%_gpg_path /root/.gnupg
%_gpgbin /usr/bin/gpg
%_gpg_digest_algo sha256
%_binary_filedigest_algorithm 8
%_binary_filedigest_algorithm sha256
%_source_filedigest_algorithm sha256
%__gpg /usr/bin/gpg
%__gpg_sign_cmd %{__gpg} \
gpg --no-tty --batch --yes --no-verbose --no-armor \
Expand All @@ -30,6 +31,6 @@ echo "%_gpg_name Grafana Labs <[email protected]>
" > ~/.rpmmacros

for f in dist/*.rpm; do
rpm --addsign "${f}"
rpm --addsign --fips --rpm-digest sha256 "${f}"
rpm --checksig "${f}"
done
5 changes: 3 additions & 2 deletions packaging/grafana-agent/rpm/gpg-sign.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ echo "%_gpg_name Grafana Labs <[email protected]>
%_gpg_path /root/.gnupg
%_gpgbin /usr/bin/gpg
%_gpg_digest_algo sha256
%_binary_filedigest_algorithm 8
%_binary_filedigest_algorithm sha256
%_source_filedigest_algorithm sha256
%__gpg /usr/bin/gpg
%__gpg_sign_cmd %{__gpg} \
gpg --no-tty --batch --yes --no-verbose --no-armor \
Expand All @@ -30,6 +31,6 @@ echo "%_gpg_name Grafana Labs <[email protected]>
" > ~/.rpmmacros

for f in dist/*.rpm; do
rpm --addsign "${f}"
rpm --addsign --fips --rpm-digest sha256 "${f}"
rpm --checksig "${f}"
done
2 changes: 2 additions & 0 deletions tools/make/packaging.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ define generate_agent_fpm =
--license "Apache 2.0" \
--vendor "Grafana Labs" \
--url "https://github.com/grafana/agent" \
--rpm-digest sha256 \
-t $(1) \
--after-install packaging/grafana-agent/$(1)/control/postinst \
--before-remove packaging/grafana-agent/$(1)/control/prerm \
Expand Down Expand Up @@ -314,6 +315,7 @@ define generate_flow_fpm =
--license "Apache 2.0" \
--vendor "Grafana Labs" \
--url "https://github.com/grafana/agent" \
--rpm-digest sha256 \
-t $(1) \
--after-install packaging/grafana-agent-flow/$(1)/control/postinst \
--before-remove packaging/grafana-agent-flow/$(1)/control/prerm \
Expand Down