[git] GnuPG - branch, master, updated. gnupg-2.1.15-238-gc2e713d

[by Justus Winter]

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  c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794 (commit)
       via  869c06efa791bbc8330becdb3f13f7cf9506257e (commit)
       via  c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2 (commit)
      from  25428be52168fa9c581b7f11c95a5c63b25343b7 (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 c2e713d9e25ef8b61e8eeb3c01ee1e31cb70b794
Author: Justus Winter <justus at g10code.com>
Date:   Fri Oct 14 11:17:50 2016 +0200

    gpgscm: Initialize nesting stack.
    
    * tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize nesting
    stack.
    
    Fixes-commit: f2249b737055f84842778285bbeff5e61fa55225
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 5a85063..0e31dc5 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -4765,6 +4765,7 @@ int scheme_init_custom_alloc(scheme *sc, func_alloc malloc, func_dealloc free) {
   sc->save_inport=sc->NIL;
   sc->loadport=sc->NIL;
   sc->nesting=0;
+  memset (sc->nesting_stack, 0, sizeof sc->nesting_stack);
   sc->interactive_repl=0;
   sc->strbuff = sc->malloc(STRBUFFSIZE);
   if (sc->strbuff == 0) {

commit 869c06efa791bbc8330becdb3f13f7cf9506257e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Oct 14 12:42:24 2016 -0400

    doc: Document how to manually shut down gpg-agent.
    
    * doc/gpg-agent.texi: document "gpgconf --kill gpg-agent" for manual
      agent termination.
    
    This was requested in a side-comment in https://bugs.debian.org/840669
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 7c41027..3177af4 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -85,6 +85,14 @@ gpg-connect-agent /bye
 @end example
 
 @noindent
+If you want to manually terminate the currently-running agent, you can
+safely do so with:
+
+ at example
+gpgconf --kill gpg-agent
+ at end example
+
+ at noindent
 @efindex GPG_TTY
 You should always add the following lines to your @code{.bashrc} or
 whatever initialization file is used for all shell invocations:
@@ -1518,6 +1526,7 @@ much slower or faster than the actual box.
 @ifset isman
 @command{@gpgname}(1),
 @command{gpgsm}(1),
+ at command{gpgconf}(1),
 @command{gpg-connect-agent}(1),
 @command{scdaemon}(1)
 @end ifset

commit c53ce53ab1fa6a328c368f2a15e3ccd803f03ee2
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Oct 14 02:23:37 2016 -0400

    doc: Point gpg-agent(1) at the right gpg manpage in SEE ALSO.
    
    * doc/gpg-agent.texi (SEE ALSO): refer to @gpgname, instead of
      hard-coding "gpg2".
    
    Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>

diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index cc10a79..7c41027 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -1516,7 +1516,7 @@ much slower or faster than the actual box.
 
 @mansect see also
 @ifset isman
- at command{gpg2}(1),
+ at command{@gpgname}(1),
 @command{gpgsm}(1),
 @command{gpg-connect-agent}(1),
 @command{scdaemon}(1)

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

Summary of changes:
 doc/gpg-agent.texi    | 11 ++++++++++-
 tests/gpgscm/scheme.c |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)


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