[git] GnuPG - branch, master, updated. gnupg-2.1.14-45-g0c2a745

[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  0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c (commit)
       via  db6f3eb926619dfe6ed2a9be197c51f9a1b6198c (commit)
      from  05cb30052cdf1d308ff7da901cfa5a809cd49479 (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 0c2a745a2bc21e8f439930f7c0e5d1521c2fd44c
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 4 13:04:28 2016 +0200

    tests: Use gpgconf to set the ssh socket envvar.
    
    * tests/openpgp/ssh.scm ("SSH_AUTH_SOCK"): Use gpgconf.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/openpgp/ssh.scm b/tests/openpgp/ssh.scm
index fe0b115..dfa1f52 100755
--- a/tests/openpgp/ssh.scm
+++ b/tests/openpgp/ssh.scm
@@ -23,7 +23,9 @@
 (if (string=? "" GNUPGHOME)
     (error "GNUPGHOME not set"))
 
-(setenv "SSH_AUTH_SOCK" (path-join GNUPGHOME "S.gpg-agent.ssh") #t)
+(setenv "SSH_AUTH_SOCK"
+        (call-check `(,(tool 'gpgconf) --null --list-dirs agent-ssh-socket))
+        #t)
 
 (define SSH-ADD #f)
 (catch (skip "ssh-add not found")

commit db6f3eb926619dfe6ed2a9be197c51f9a1b6198c
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Aug 4 13:02:37 2016 +0200

    gpgconf: Add limited support for -0.
    
    * tools/gpgconf.h (opt): Add field 'null'.
    * tools/gpgconf.c: Add option --null/-0.
    (list_dirs): Use it here.
    --
    
    This option changes the delimites for --list-dir with arguments from
    LF to Nul.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index ad61511..f7ce4c9 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -40,6 +40,7 @@ enum cmd_and_opt_values
     oVerbose	= 'v',
     oRuntime    = 'r',
     oComponent  = 'c',
+    oNull       = '0',
     oNoVerbose	= 500,
     oHomedir,
 
@@ -93,6 +94,7 @@ static ARGPARSE_OPTS opts[] =
     { oRuntime, "runtime",  0, N_("activate changes at runtime, if possible") },
     /* hidden options */
     { oHomedir, "homedir", 2, "@" },
+    { oNull, "null", 0, "@" },
     { oNoVerbose, "no-verbose",  0, "@"},
     {0}
   };
@@ -197,7 +199,10 @@ list_dirs (estream_t fp, char **names)
         {
           for (j=0; names[j]; j++)
             if (!strcmp (names[j], list[idx].name))
-              es_fprintf (fp, "%s\n", s);
+              {
+                es_fputs (s, fp);
+                es_putc (opt.null? '\0':'\n', fp);
+              }
         }
 
       xfree (tmp);
@@ -241,6 +246,7 @@ main (int argc, char **argv)
         case oVerbose:   opt.verbose++; break;
         case oNoVerbose: opt.verbose = 0; break;
         case oHomedir:   gnupg_set_homedir (pargs.r.ret_str); break;
+        case oNull:      opt.null = 1; break;
 
 	case aListDirs:
         case aListComponents:
diff --git a/tools/gpgconf.h b/tools/gpgconf.h
index d63833d..a1e3828 100644
--- a/tools/gpgconf.h
+++ b/tools/gpgconf.h
@@ -29,6 +29,7 @@ struct
   int quiet;		/* Be extra quiet.  */
   int dry_run;		/* Don't change any persistent data.  */
   int runtime;		/* Make changes active at runtime.  */
+  int null;             /* Option -0 active.  */
   char *outfile;	/* Name of output file.  */
 
   int component;	/* The active component.  */

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

Summary of changes:
 tests/openpgp/ssh.scm | 4 +++-
 tools/gpgconf.c       | 8 +++++++-
 tools/gpgconf.h       | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)


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