From: Daniel Kahn Gillmor Date: Mon, 21 Nov 2016 04:09:24 +0000 (-0500) Subject: dirmngr: Avoid automatically checking upstream swdb. X-Git-Tag: archive/raspbian/2.2.10-1+rpi1~1^2~17 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8b6400448d75e74be607461a4f6c5e415a50fd21;p=gnupg2.git dirmngr: Avoid automatically checking upstream swdb. * dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically checking upstream's software database. In Debian, software updates should be handled by the distro mechanism, and additional upstream checks only confuse the user. * doc/dirmngr.texi: document that --allow-version-check does nothing. Signed-off-by: Daniel Kahn Gillmor Gbp-Pq: Topic dirmngr-idling Gbp-Pq: Name dirmngr-Avoid-automatically-checking-upstream-swdb.patch --- diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 52bea68..928a349 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1945,8 +1945,6 @@ housekeeping_thread (void *arg) if (network_activity_seen) { network_activity_seen = 0; - if (opt.allow_version_check) - dirmngr_load_swdb (&ctrlbuf, 0); workqueue_run_global_tasks (&ctrlbuf, 1); } else diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi index 76be528..742658e 100644 --- a/doc/dirmngr.texi +++ b/doc/dirmngr.texi @@ -290,9 +290,10 @@ Set the size of the queue for pending connections. The default is 64. @item --allow-version-check @opindex allow-version-check Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get -the list of current software versions. If this option is enabled -the list is retrieved in case the local -copy does not exist or is older than 5 to 7 days. See the option +the list of current software versions. +On debian-packaged versions, this option does nothing since software +updates should be handled by the distribution. +See the option @option{--query-swdb} of the command @command{gpgconf} for more details. Note, that regardless of this option a version check can always be triggered using this command: