File: 0004-Replace-use-of-the-GPGME_KEYLIST_MODE_LOCATE-alias.patch

package info (click to toggle)
gpa 0.10.0-3
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, bullseye, sid
  • size: 5,584 kB
  • sloc: ansic: 35,060; sh: 5,240; makefile: 212; sed: 16
file content (29 lines) | stat: -rw-r--r-- 1,038 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From: Werner Koch <wk@gnupg.org>
Date: Thu, 18 Oct 2018 11:29:05 +0200
Subject: Replace use of the GPGME_KEYLIST_MODE_LOCATE alias

* src/gpaimportserverop.c (search_keys): Use Extern and local instead.
--

This way we can build with older gpgme versions.

Reported-by: Andreas Stieger <astieger@suse.com>
Signed-off-by: Werner Koch <wk@gnupg.org>
---
 src/gpaimportserverop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gpaimportserverop.c b/src/gpaimportserverop.c
index 76eb78d..e52a14c 100644
--- a/src/gpaimportserverop.c
+++ b/src/gpaimportserverop.c
@@ -148,7 +148,8 @@ search_keys (GpaImportOperation *operation, const char *keyid)
   mbox = gpgme_addrspec_from_uid (keyid);
   if (mbox)
     {
-      listmode = GPGME_KEYLIST_MODE_LOCATE;
+      /* GPGME_KEYLIST_MODE_LOCATE is an alias for below. */
+      listmode = (GPGME_KEYLIST_MODE_LOCAL | GPGME_KEYLIST_MODE_EXTERN);
       /* We already extracted the mbox - use it directly than letting
        * gnupg extract it.  */
       keyid = mbox;