Brad Bishop | 37a0e4d | 2017-12-04 01:01:44 -0500 | [diff] [blame^] | 1 | From fa9726ff69f86d6a87c4c4bd7e3d2881999a872a Mon Sep 17 00:00:00 2001 |
| 2 | From: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| 3 | Date: Thu, 23 Feb 2017 11:14:20 +0200 |
| 4 | Subject: [PATCH] macros: add %_gpg_sign_cmd_extra_args |
| 5 | |
| 6 | Similar to what rpm4 has. This macro can be used to customize the |
| 7 | gpg command line options when signing packages. This is needed for |
| 8 | gpg 2.1 which requires "--pinentry-mode loopback" to allow |
| 9 | non-interactive signing. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| 14 | --- |
| 15 | macros/macros.in | 5 ++++- |
| 16 | 1 file changed, 4 insertions(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/macros/macros.in b/macros/macros.in |
| 19 | index 8bc5840..fda3c66 100644 |
| 20 | --- a/macros/macros.in |
| 21 | +++ b/macros/macros.in |
| 22 | @@ -524,7 +524,9 @@ $_arbitrary_tags_tests Foo:Bar |
| 23 | %_gpg_passphrase_way %{?_gpg_passphrase:--passphrase "%{_gpg_passphrase}"}%{!?_gpg_passphrase:--passphrase-fd 3} |
| 24 | |
| 25 | %__gpg_check_password_cmd %{__gpg} \ |
| 26 | - gpg --batch --no-verbose %{_gpg_passphrase_way} -u "%{_gpg_name}" -so - |
| 27 | + gpg --batch --no-verbose %{_gpg_passphrase_way} \ |
| 28 | + %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ |
| 29 | + -u "%{_gpg_name}" -so - |
| 30 | #%__pgp_check_password_cmd %{__pgp} \ |
| 31 | # pgp +batchmode=on +verbose=0 "%{_pgp_name}" -sf |
| 32 | #%__pgp5_check_password_cmd %{__pgp} \ |
| 33 | @@ -532,6 +534,7 @@ $_arbitrary_tags_tests Foo:Bar |
| 34 | |
| 35 | %__gpg_sign_cmd %{__gpg} \ |
| 36 | gpg --batch --no-verbose --no-armor %{_gpg_passphrase_way} --no-secmem-warning \ |
| 37 | + %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ |
| 38 | -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} |
| 39 | #%__pgp_sign_cmd %{__pgp} \ |
| 40 | # pgp +batchmode=on +verbose=0 +armor=off \ |
| 41 | -- |
| 42 | 2.10.2 |
| 43 | |