[git] GnuPG - branch, master, updated. gnupg-2.1.2-21-g007d9d5

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  007d9d57da69af95138d203846ba4d2bf3aaf51e (commit)
       via  82146af85b65498a69b28913593dc1ffeb6b6fed (commit)
      from  c071be698efadef1ad01fd3d329d1b486a372927 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 007d9d57da69af95138d203846ba4d2bf3aaf51e
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Mar 4 15:10:52 2015 +0100

    doc: Fix FAQ stub and remove faq build rules.
    
    --
    
    The FAQ is maintained in the gnupg-doc repo.

diff --git a/doc/FAQ b/doc/FAQ
index 32d0744..309788c 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -3,11 +3,11 @@ GnuPG Frequently Asked Questions
 A FAQ is a fast moving target and thus we don't distribute it anymore
 with GnuPG.  You may retrieve the current FAQ in HTML format at
 
-  http://www.gnupg.org/faq/GnuPG-FAQ.html
+  https://gnupg.org/faq/gnupg-faq.html
 
-or in plain text format at the FTP server:
+or in plain text format at
 
-  ftp://ftp.gnupg.org/gcrypt/gnupg/GnuPG-FAQ.txt
+  https://gnupg.org/faq/gnupg-faq.txt
 
 
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a308444..240bcf3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -75,7 +75,7 @@ man_MANS = $(myman_pages) gnupg.7
 watchgnupg_SOURCE = gnupg.texi
 
 
-CLEANFILES = yat2m faq.txt faq.html
+CLEANFILES = yat2m
 
 DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
 		 $(myman_pages) gnupg.7
@@ -139,24 +139,3 @@ online: gnupg.html gnupg.pdf
 	cd gnupg.html ; \
         rsync -vr --exclude='.git' .  \
 	  $${user}@$${webhost}:webspace/manuals/gnupg$${dashdevel}/
-
-# Note that you need a recent version of emacs23 with org-mode 7.01h
-faq.txt faq.html: faq.org
-	@set -e; expopt="t nil nil nil \"$$(pwd)\""; \
-	 emacs  --batch \
-	  --eval "(require 'org)" \
-	  --visit "$(srcdir)/faq.org" \
-          --eval "(setq org-export-ascii-entities 'utf8)" \
-          --eval "(org-export-as-ascii org-export-headline-levels $${expopt})"\
-	  --visit "$(srcdir)/faq.org" \
-          --eval "(setq org-export-html-style-include-default nil)" \
-          --eval "(setq org-export-html-style-include-scripts nil)" \
-          --eval "(org-export-as-html org-export-headline-levels $${expopt})"
-
-faq-online: faq.txt faq.html
-	set -e; \
-        user=werner ; webhost="ftp.gnupg.org" ; ftphost="ftp.gnupg.org" ; \
-	echo "Uploading current FAQ to {www,ftp}.gnupg.org ..."; \
-	scp faq.html $${user}@$${webhost}:webspace/manuals/GnuPG-FAQ.html ; \
-	scp faq.txt  $${user}@$${ftphost}:gcrypt/gnupg/GnuPG-FAQ.txt ; \
-	echo "...ready"

commit 82146af85b65498a69b28913593dc1ffeb6b6fed
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Feb 21 11:04:13 2015 -0500

    gpg: avoid chatter about trustdb when --quiet
    
    * g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
      opt.quiet
    --
    
    gpg(1) says:
    
           -q, --quiet
                  Try to be as quiet as possible.
    
    While the mentions about the stale trustdb information are edifying,
    they aren't necessary, and shouldn't be emitted when the user requests
    --quiet.
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/g10/trustdb.c b/g10/trustdb.c
index f0b5501..6145cf0 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -938,11 +938,13 @@ tdb_check_trustdb_stale (void)
           if (opt.no_auto_check_trustdb)
             {
               pending_check_trustdb = 1;
-              log_info (_("please do a --check-trustdb\n"));
+              if (!opt.quiet)
+                log_info (_("please do a --check-trustdb\n"));
             }
           else
             {
-              log_info (_("checking the trustdb\n"));
+              if (!opt.quiet)
+                log_info (_("checking the trustdb\n"));
               validate_keys (0);
             }
         }

-----------------------------------------------------------------------

Summary of changes:
 doc/FAQ         |  6 +++---
 doc/Makefile.am | 23 +----------------------
 g10/trustdb.c   |  6 ++++--
 3 files changed, 8 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org