sergio/takana

1From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2From: Jakub Jirutka <jakub@jirutka.cz>
3Date: Sun, 20 Nov 2016 23:09:24 -0500
4Date: Wed, 18 Aug 2021 21:08:20 +0200
5Subject: dirmngr: Avoid automatically checking upstream swdb.
6
7* dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically
8checking upstream's software database.  In Debian, software updates
9should be handled by the distro mechanism, and additional upstream
10checks only confuse the user.
11* doc/dirmngr.texi: document that --allow-version-check does nothing.
12
13Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
14---
15 dirmngr/dirmngr.c | 2 --
16 doc/dirmngr.texi  | 7 ++++---
17 2 files changed, 4 insertions(+), 5 deletions(-)
18
19Patch-Source: https://sources.debian.org/data/main/g/gnupg2/2.2.27-2/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch
20
21diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
22index 89eea4e..f26ed63 100644
23--- a/dirmngr/dirmngr.c
24+++ b/dirmngr/dirmngr.c
25@@ -1955,8 +1955,6 @@ housekeeping_thread (void *arg)
26   if (network_activity_seen)
27     {
28       network_activity_seen = 0;
29-      if (opt.allow_version_check)
30-        dirmngr_load_swdb (&ctrlbuf, 0);
31       workqueue_run_global_tasks (&ctrlbuf, 1);
32     }
33   else
34diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
35index 843fdbf..84a8d28 100644
36--- a/doc/dirmngr.texi
37+++ b/doc/dirmngr.texi
38@@ -291,9 +291,10 @@ Set the size of the queue for pending connections.  The default is 64.
39 @item --allow-version-check
40 @opindex allow-version-check
41 Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
42-the list of current software versions.  If this option is enabled
43-the list is retrieved in case the local
44-copy does not exist or is older than 5 to 7 days.  See the option
45+the list of current software versions.
46+On Alpine-packaged versions, this option does nothing since software
47+updates should be handled by the distribution.
48+See the option
49 @option{--query-swdb} of the command @command{gpgconf} for more
50 details.  Note, that regardless of this option a version check can
51 always be triggered using this command: