[Pkg-gnupg-commit] [gnupg2] 292/292: import patch from upstream

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 626693bd42c6afa7e8abeef6d51f460e6becc75d
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Nov 21 01:10:03 2016 -0500

    import patch from upstream
---
 .../0013-agent-Fix-npth-daemon-mode-problem.patch  | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0013-agent-Fix-npth-daemon-mode-problem.patch b/debian/patches/0013-agent-Fix-npth-daemon-mode-problem.patch
new file mode 100644
index 0000000..2dad354
--- /dev/null
+++ b/debian/patches/0013-agent-Fix-npth-daemon-mode-problem.patch
@@ -0,0 +1,31 @@
+From: NIIBE Yutaka <gniibe at fsij.org>
+Date: Mon, 21 Nov 2016 11:18:33 +0900
+Subject: agent: Fix npth + daemon mode problem.
+
+* agent/gpg-agent.c (main): Remove duplicated initialization in daemon
+mode.
+
+--
+The commit f57dc2b1e6f28d164f882373535dbcb0d632ca17 fixes a part of
+problem (for missing initialization of supervised mode).  It was
+actually put in wrong place.
+
+Fixes-commit: 9f92b62a51d2d60f038fdbe01602865c5933fa95
+Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
+---
+ agent/gpg-agent.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
+index 2bc70e3..fa67a3a 100644
+--- a/agent/gpg-agent.c
++++ b/agent/gpg-agent.c
+@@ -1484,8 +1484,6 @@ main (int argc, char **argv )
+       pid_t pid;
+ #endif
+ 
+-      initialize_modules ();
+-
+       /* Remove the DISPLAY variable so that a pinentry does not
+          default to a specific display.  There is still a default
+          display when gpg-agent was started using --display or a
diff --git a/debian/patches/series b/debian/patches/series
index 2dded98..fd02327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
 gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
 gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+0013-agent-Fix-npth-daemon-mode-problem.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git