[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.29-4-gd4a2a07

[by NIIBE Yutaka]

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, STABLE-BRANCH-2-0 has been updated
       via  d4a2a070b4b4d30a6bbdd4248421a23cf824d8c0 (commit)
      from  1dea3746b487666ef108cacc84a426bcc993fe51 (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 d4a2a070b4b4d30a6bbdd4248421a23cf824d8c0
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Sep 10 10:00:03 2015 +0900

    gpgconf: Fix scdaemon reload.
    
    * tools/gpgconf-comp.c (scdaemon_runtime_change): Add "scd bye".
    
    --
    
    In GnuPG 2.0.x, it doesn't require newer libassuan which has
    ASSUAN_FORCE_CLOSE feature.  We need to send "scd bye" to let
    the control finish from command loop.

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 2454f93..69d160e 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1064,7 +1064,7 @@ scdaemon_runtime_change (void)
 {
   gpg_error_t err;
   const char *pgmname;
-  const char *argv[6];
+  const char *argv[7];
   pid_t pid;
 
   /* We use "GETINFO app_running" to see whether the agent is already
@@ -1077,8 +1077,9 @@ scdaemon_runtime_change (void)
   argv[1] = "GETINFO scd_running";
   argv[2] = "/if ${! $?}";
   argv[3] = "scd killscd";
-  argv[4] = "/end";
-  argv[5] = NULL;
+  argv[4] = "scd bye";
+  argv[5] = "/end";
+  argv[6] = NULL;
 
   err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid);
   if (!err)

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

Summary of changes:
 tools/gpgconf-comp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


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