summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Filak <jfilak@redhat.com>2016-09-02 14:41:34 +0200
committerFlorian Festi <ffesti@redhat.com>2016-09-08 17:42:40 +0200
commit932f14fdf8dc0ef0a911e5af7eae4ecddfa759c4 (patch)
tree6ddca1cb074464154cae135594318eba9306bdde
parent1f553f9cdccf6e59685da5309677530b33ede38a (diff)
downloadrpm-932f14fdf8dc0ef0a911e5af7eae4ecddfa759c4.tar.gz
macros: make rpmsig's gpg command alterable
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>
-rw-r--r--macros.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/macros.in b/macros.in
index 480fc696a..b03c5a9e9 100644
--- a/macros.in
+++ b/macros.in
@@ -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