Skip to content

Commit

Permalink
Support passing an alternative home to Sequoia signing too
Browse files Browse the repository at this point in the history
The macro name is stupid, %_sq_home would be better but to be consistent
with the long standing %_gpg_path counterpart...
  • Loading branch information
pmatilai authored and ffesti committed Nov 28, 2024
1 parent 828f9b5 commit ee651ac
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions docs/man/rpmsign.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ Implementation specific macros:
: Legacy macro for configuring user id with GnuPG. Use the implementation
independent and non-ambiguous **%\_openpgp_sign_id** instead.

**%\_sq\_path**

: The location of your Sequoia configuration if not the default.

For example, to configure rpm to sign with Sequoia PGP using a key with
fingerprint of 7B36C3EE0CCE86EDBC3EFF2685B274E29F798E08 you would include

Expand Down
6 changes: 6 additions & 0 deletions macros.in
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,11 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
#
#%_gpg_path /some/path

# Optional alternative path for Sequoia-sq configuration, same as
# passing --home to sq.
#
#%_sq_path /some/path

# The port and machine name of an HTTP proxy host (used for FTP/HTTP).
#
#%_httpport
Expand Down Expand Up @@ -630,6 +635,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%__sq @__SQ@
%__sq_sign_cmd %{shescape:%{__sq}} \
%{__sq} sign \
%{?_sq_path:--homedir %{shescape:%{_sq_path}}} \
%{?_openpgp_sign_id:--signer-key %{_openpgp_sign_id}} \
%{?_sq_sign_cmd_extra_args} \
--binary --detached --output %{shescape:%{?__signature_filename}} \
Expand Down

0 comments on commit ee651ac

Please sign in to comment.