Skip to content

Commit

Permalink
macros: make rpmsig's gpg command alterable
Browse files Browse the repository at this point in the history
The current version of gpg2 asks for password using a curses dialogue
or a GTK dialogue. Both methods breaks automation of package signing.

If we want to be asked the old way on terminal, we must run gpg2 with
additional arguments '--pinentry-mode loopback' (and gpg-agent must be
allow looping back (--allow-loopback) - allowed by default since 2.1.13).

Currently there is no other way how to tweak gpg command line than
creating a wrapper script and redefining %__gpg macro.

The wrapper script method can lead to use of wrong version of gpg
binary, hence, this patch adds possibility to specify additional command
lines argument passed on gpg's command line.

Signed-off-by: Jakub Filak <jfilak@redhat.com>
  • Loading branch information
Jakub Filak authored and ffesti committed Sep 8, 2016
1 parent 1f553f9 commit 932f14f
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions macros.in
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,7 @@ package or when debugging this package.\
gpg --no-verbose --no-armor \
%{?_gpg_digest_algo:--digest-algo %{_gpg_digest_algo}} \
--no-secmem-warning \
%{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \
-u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}

# XXX rpm >= 4.1 verifies signatures internally
Expand Down

0 comments on commit 932f14f

Please sign in to comment.