pool/gpg2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 820859 from home:pmonrealgonzalez:branches:Base:System

Browse Source 
- Fix regression in latest gpg2 that makes gpgme fail to build [bsc#1174007]
- Add gnupg-gpgme-t-encrypt-sym.patch

OBS-URL: https://build.opensuse.org/request/show/820859
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=251
This commit is contained in:
Pedro Monreal Gonzalez 2020-07-14 11:02:45 +00:00 committed by Git OBS Bridge
parent a1dcded9f7
commit 87317a4d5e
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnupg-gpgme-t-encrypt-sym.patch Normal file
View File

@ -0,0 +1,21 @@
Index: gnupg-2.2.21/agent/command.c
===================================================================
--- gnupg-2.2.21.orig/agent/command.c
+++ gnupg-2.2.21/agent/command.c
@@ -1595,11 +1595,14 @@ cmd_get_passphrase (assuan_context_t ctx
pi2->failed_tries = 0;
continue;
}
- if (*pi->pin && !pi->repeat_okay)
+ if (*pi->pin && !pi->repeat_okay
+ && ctrl->pinentry_mode != PINENTRY_MODE_LOOPBACK)
{
/* The passphrase is empty and the pinentry did not
* already run the repetition check, do it here. This
- * is only called when using an old and simple pinentry. */
+ * is only called when using an old and simple pinentry.
+ * It is neither called in loopback mode because the
+ * caller does any passphrase repetition by herself. */
xfree (response);
response = NULL;
rc = agent_get_passphrase (ctrl, &response,

6
gpg2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 14 10:22:22 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
- Fix regression in latest gpg2 that makes gpgme fail to build [bsc#1174007]
- Add gnupg-gpgme-t-encrypt-sym.patch
-------------------------------------------------------------------
Thu Jul 9 11:36:57 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

3
gpg2.spec
View File

@ -40,6 +40,8 @@ Patch13: gnupg-accept_subkeys_with_a_good_revocation_but_no_self-sig_duri
Patch14: gnupg-add-test-cases-for-import-without-uid.patch
Patch15: gnupg-allow-import-of-previously-known-keys-even-without-UIDs.patch
Patch1124847: gnupg-gpg-agent-ulimit.patch
# PATCH-FIX-UPSTREAM bsc#1174007 gpgme: Fails to build with latest gpg-2.2.21
Patch16: gnupg-gpgme-t-encrypt-sym.patch
BuildRequires: expect
BuildRequires: fdupes
BuildRequires: libassuan-devel >= 2.5.0
@ -105,6 +107,7 @@ gpgsm, or via the gpg-connect-agent tool.
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
touch -d 2018-05-04 doc/gpg.texi # to compensate for patch11 in order to not have man pages and info files have the build date (boo#1047218)
%build