- from gpg manual for --passphrase-fd option: "Since Version 2.1 the --pinentry-mode...

diff --git a/rpm-gpg-pinentry.patch b/rpm-gpg-pinentry.patch
new file mode 100644 (file)
index 0000000..531f1b3
--- /dev/null
+++ b/rpm-gpg-pinentry.patch
@@ -0,0 +1,24 @@
+diff -ruN rpm-5.4.15.orig/macros/macros rpm-5.4.15/macros/macros
+--- rpm-5.4.15.orig/macros/macros      2014-08-17 14:02:20.000000000 +0200
++++ rpm-5.4.15/macros/macros   2018-09-24 15:46:44.323052200 +0200
+@@ -519,7 +519,7 @@
+ #     signing and verification.
+ #
+ %__gpg_check_password_cmd     %{__gpg} \
+-      gpg --batch --no-verbose --passphrase-fd 3 -u "%{_gpg_name}" -so -
++      gpg --batch --pinentry-mode loopback --no-verbose --passphrase-fd 3 -u "%{_gpg_name}" -so -
+ #%__pgp_check_password_cmd    %{__pgp} \
+ #     pgp +batchmode=on +verbose=0 "%{_pgp_name}" -sf
+ #%__pgp5_check_password_cmd   %{__pgp} \
+diff -ruN rpm-5.4.15.orig/macros/macros.in rpm-5.4.15/macros/macros.in
+--- rpm-5.4.15.orig/macros/macros.in   2014-08-09 00:40:40.000000000 +0200
++++ rpm-5.4.15/macros/macros.in        2018-09-24 15:46:34.807097580 +0200
+@@ -519,7 +519,7 @@
+ #     signing and verification.
+ #
+ %__gpg_check_password_cmd     %{__gpg} \
+-      gpg --batch --no-verbose --passphrase-fd 3 -u "%{_gpg_name}" -so -
++      gpg --batch --pinentry-mode loopback --no-verbose --passphrase-fd 3 -u "%{_gpg_name}" -so -
+ #%__pgp_check_password_cmd    %{__pgp} \
+ #     pgp +batchmode=on +verbose=0 "%{_pgp_name}" -sf
+ #%__pgp5_check_password_cmd   %{__pgp} \

diff --git a/rpm.spec b/rpm.spec
index 84568ccbeafcf78164a26e84b0ac3f46f68497f3..56ea152522c20ce0bbb182129399cc7aaaa14520 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -183,6 +183,7 @@ Patch95:    rpm-python-spec-header.patch
 Patch96:       skip-ldconfig-optimization.patch
 Patch97:       glibc.patch
 Patch98:       extension-based-compression-detection.patch
 Patch96:       skip-ldconfig-optimization.patch
 Patch97:       glibc.patch
 Patch98:       extension-based-compression-detection.patch

+Patch99:       %{name}-gpg-pinentry.patch

 
 # Patches imported from Mandriva
 
 
 # Patches imported from Mandriva
 


@@ -960,6 +961,7 @@ cd -
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1

+%patch99 -p1

 
 %patch1000 -p1
 %patch1001 -p1
 
 %patch1000 -p1
 %patch1001 -p1