[Pkg-gnupg-commit] [gnupg2] 04/05: clean up gpg-agent-idling patch

[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 0bf7b9aac674dca3cde6fb3939ebe2bff605c602
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Jan 18 13:09:29 2017 -0500

    clean up gpg-agent-idling patch
---
 ...-agent-Reduce-sleep-time-in-the-progress-callback.patch |  2 +-
 ...nt-Allow-threads-to-interrupt-main-select-loop-wi.patch | 14 +++-----------
 .../0003-agent-Avoid-tight-timer-tick-when-possible.patch  |  4 ++--
 ...nt-Avoid-scheduled-checks-on-socket-when-inotify-.patch |  4 ++--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0061-agent-Reduce-sleep-time-in-the-progress-callback.patch b/debian/patches/0061-agent-Reduce-sleep-time-in-the-progress-callback.patch
index b7e57c6..c645d3e 100644
--- a/debian/patches/0061-agent-Reduce-sleep-time-in-the-progress-callback.patch
+++ b/debian/patches/0061-agent-Reduce-sleep-time-in-the-progress-callback.patch
@@ -15,7 +15,7 @@ Signed-off-by: Werner Koch <wk at gnupg.org>
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index b11d4985c..bda134a97 100644
+index d8c574fe6..5d62faf26 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
 @@ -1770,11 +1770,19 @@ agent_libgcrypt_progress_cb (void *data, const char *what, int printchar,
diff --git a/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch b/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 6d294d3..be89c24 100644
--- a/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+++ b/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
@@ -17,8 +17,8 @@ proposed improvements.
 Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
 ---
  agent/agent.h     |  1 +
- agent/gpg-agent.c | 19 ++++++++++++++++++-
- 2 files changed, 19 insertions(+), 1 deletion(-)
+ agent/gpg-agent.c | 18 +++++++++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/agent/agent.h b/agent/agent.h
 index 89dc46d05..147d242ec 100644
@@ -33,7 +33,7 @@ index 89dc46d05..147d242ec 100644
  /*-- command.c --*/
  gpg_error_t agent_inq_pinentry_launched (ctrl_t ctrl, unsigned long pid,
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 82c8ae062..04a775c9b 100644
+index 82c8ae062..f7b6e72c9 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
 @@ -382,6 +382,9 @@ static char *current_logfile;
@@ -91,11 +91,3 @@ index 82c8ae062..04a775c9b 100644
  #else
  # ifdef HAVE_W32CE_SYSTEM
    /* Use a dummy event. */
-@@ -2765,6 +2781,7 @@ handle_connections (gnupg_fd_t listen_fd,
- # endif
- #endif
- 
-+
-   if (disable_check_own_socket)
-     my_inotify_fd = -1;
-   else if ((err = gnupg_inotify_watch_socket (&my_inotify_fd, socket_name)))
diff --git a/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
index d09bdc0..51ca0cc 100644
--- a/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
@@ -41,7 +41,7 @@ index ba59c1825..1ac0f6ba5 100644
    xfree (abs_homedir);
    if (err)
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 04a775c9b..d117d03f9 100644
+index f7b6e72c9..de9c7c9ee 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
 @@ -2267,6 +2267,26 @@ create_directories (void)
@@ -100,7 +100,7 @@ index 04a775c9b..d117d03f9 100644
    return NULL;
  }
  
-@@ -2872,6 +2894,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2871,6 +2893,9 @@ handle_connections (gnupg_fd_t listen_fd,
           thus a simple assignment is fine to copy the entire set.  */
        read_fdset = fdset;
  
diff --git a/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch b/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index ee1ee7c..2d9a168 100644
--- a/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+++ b/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
@@ -12,10 +12,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
  1 file changed, 2 insertions(+)
 
 diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index d117d03f9..b11d4985c 100644
+index de9c7c9ee..d8c574fe6 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
-@@ -2896,6 +2896,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2895,6 +2895,8 @@ handle_connections (gnupg_fd_t listen_fd,
  
        /* avoid a fine-grained timer if we don't need one: */
        timertbl[0].interval.tv_sec = need_tick () ? TIMERTICK_INTERVAL : 0;

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