[git] GnuPG - branch, master, updated. gnupg-2.1.8-72-gd5b4b4d

[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  d5b4b4d9c16cb42331aa379755038fd5abf0f2d0 (commit)
       via  9db6547a00cded92c00c8f8382b1b605be1027d2 (commit)
      from  625e292108cc0fd9077769587a8c22abe7805e33 (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 d5b4b4d9c16cb42331aa379755038fd5abf0f2d0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 6 13:11:12 2015 +0200

    po: Typo fix in German translation.
    
    --

diff --git a/po/de.po b/po/de.po
index 279377a..eadc7b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-10-05 11:17+0200\n"
+"PO-Revision-Date: 2015-10-06 12:50+0200\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -5227,7 +5227,7 @@ msgstr "trustdb Transaktion zu groß\n"
 
 #, c-format
 msgid "can't access '%s': %s\n"
-msgstr "kann aus `%s' nicht zugreifen: %s\n"
+msgstr "kann auf `%s' nicht zugreifen: %s\n"
 
 #, c-format
 msgid "%s: directory does not exist!\n"

commit 9db6547a00cded92c00c8f8382b1b605be1027d2
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 6 13:10:26 2015 +0200

    dirmngr: Do tilde expansion for --hkp-cacert.
    
    * dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
    check for cert file existance in option --hkp-cacert.
    --
    
    GnuPG-bug-id: 2120
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 847a65d..a32040e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -580,7 +580,20 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
     case oMaxReplies: opt.max_replies = pargs->r.ret_int; break;
 
     case oHkpCaCert:
-      http_register_tls_ca (pargs->r.ret_str);
+      {
+        char *tmpname;
+
+        /* Do tilde expansion and print a warning if the file can't be
+           accessed.  */
+        tmpname = make_absfilename_try (pargs->r.ret_str, NULL);
+        if (!tmpname || access (tmpname, F_OK))
+          log_info (_("can't access '%s': %s\n"),
+                    tmpname? tmpname : pargs->r.ret_str,
+                    gpg_strerror (gpg_error_from_syserror()));
+        else
+          http_register_tls_ca (tmpname);
+        xfree (tmpname);
+      }
       break;
 
     case oIgnoreCertExtension:
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index a5bcc73..18e8189 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -433,7 +433,7 @@ Use the root certificates in @var{file} for verification of the TLS
 certificates used with @code{hkps} (keyserver access over TLS).  If
 the file is in PEM format a suffix of @code{.pem} is expected for
 @var{file}.  This option may be given multiple times to add more
-root certificates.
+root certificates.  Tilde expansion is supported.
 
 @end table
 
diff --git a/g10/dirmngr-conf.skel b/g10/dirmngr-conf.skel
index 0888fb7..8857843 100644
--- a/g10/dirmngr-conf.skel
+++ b/g10/dirmngr-conf.skel
@@ -56,6 +56,6 @@ keyserver hkp://keys.gnupg.net
 # used for the connection.  Enter the full name of a file with the
 # root certificates here.  If that file is in PEM format a ".pem"
 # suffix is expected.  This option may be given multiple times to add
-# more root certificates.
+# more root certificates.  Tilde expansion is supported.
 
 #hkp-cacert /path/to/CA/sks-keyservers.netCA.pem

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

Summary of changes:
 dirmngr/dirmngr.c     | 15 ++++++++++++++-
 doc/dirmngr.texi      |  2 +-
 g10/dirmngr-conf.skel |  2 +-
 po/de.po              |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)


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