[Pkg-gnupg-commit] [gnupg2] 01/04: document that debian disables --allow-version-check

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 20b1321b34d8505a1576204d0b0cc3543610da30
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Feb 4 18:46:24 2017 -0500

    document that debian disables --allow-version-check
---
 .../0014-dirmngr-New-option-disable-ipv4.patch     |  4 ++--
 ...void-automatically-checking-upstream-swdb.patch | 26 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch b/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
index ad0fb58..0aa0549 100644
--- a/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
+++ b/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
@@ -228,10 +228,10 @@ index 9127cf754..b46c78567 100644
    if (err)
      {
 diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index e27157c00..fcc174f92 100644
+index dd104273d..b00c2d377 100644
 --- a/doc/dirmngr.texi
 +++ b/doc/dirmngr.texi
-@@ -313,6 +313,11 @@ not be used a different one can be given using this option.  Note that
+@@ -312,6 +312,11 @@ not be used a different one can be given using this option.  Note that
  a numerical IP address must be given (IPv6 or IPv4) and that no error
  checking is done for @var{ipaddr}.
  
diff --git a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index 37adacd..7791852 100644
--- a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
@@ -6,11 +6,13 @@ Subject: dirmngr: Avoid automatically checking upstream swdb.
 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 <dkg at fifthhorseman.net>
 ---
  dirmngr/dirmngr.c | 13 -------------
- 1 file changed, 13 deletions(-)
+ doc/dirmngr.texi  | 11 +++++------
+ 2 files changed, 5 insertions(+), 19 deletions(-)
 
 diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
 index a8be56fa4..746f43d10 100644
@@ -43,3 +45,25 @@ index a8be56fa4..746f43d10 100644
    if (opt.verbose > 1)
      log_info ("ready with housekeeping\n");
    sentinel--;
+diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
+index e27157c00..dd104273d 100644
+--- a/doc/dirmngr.texi
++++ b/doc/dirmngr.texi
+@@ -266,12 +266,11 @@ seconds.
+ @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, or
+-if @option{use-tor} is active, the list is retrieved when the local
+-copy does not exist or is older than 5 to 7 days.  See the option
+- at 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:
++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
++ at command{gpgconf} for more details.  Note, that regardless of this
++option a version check can always be triggered using this command:
+ 
+ @example
+        gpg-connect-agent --dirmngr 'loadswdb --force' /bye

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git