[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-68-g42dd395

[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  42dd3956cc59297585c161ff735d89387a34d147 (commit)
      from  3cfe527fa57167d0477c0f6250ca28e8f4dd1b0e (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 42dd3956cc59297585c161ff735d89387a34d147
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Feb 4 09:07:22 2013 +0900

    agent: kill pinentry by SIGINT, fixing a bug to be killed by SIGINT.
    
    * agent/call-pinentry.c (atfork_cb): Reset signal mask and signal
    handler for child process.
    (agent_popup_message_stop): Send SIGINT (was: SIGKILL).
    --
    pinentry-curses should be killed by SIGINT, so that it can reset
    terminal settings, but it didn't work.

diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index 2483019..c945c13 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -170,6 +170,16 @@ static void
 atfork_cb (void *opaque, int where)
 {
   ctrl_t ctrl = opaque;
+#ifndef HAVE_W32_SYSTEM
+  struct sigaction sa;
+
+  /* Pop up message should be able to be killed by SIGINT.  */
+  sigemptyset (&sa.sa_mask);
+  sa.sa_handler = SIG_DFL;
+  sa.sa_flags = 0;
+  sigaction (SIGINT, &sa, NULL);
+  sigprocmask (SIG_SETMASK, &sa.sa_mask, NULL); /* Unblock all signals.  */
+#endif
 
   if (!where)
     {
@@ -1159,8 +1169,7 @@ agent_popup_message_stop (ctrl_t ctrl)
         assuan_set_flag (entry_ctx, ASSUAN_NO_WAITPID, 1);
     }
   else if (pid > 0)
-    kill (pid, SIGKILL);  /* Need to use SIGKILL due to bad
-                             interaction of SIGINT with Pth. */
+    kill (pid, SIGINT);
 #endif
 
   /* Now wait for the thread to terminate. */

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

Summary of changes:
 agent/call-pinentry.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


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