diff options
Diffstat (limited to '')
4 files changed, 25 insertions, 25 deletions
diff --git a/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch b/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch index 2061327..8b9b105 100644 --- a/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch +++ b/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch @@ -21,10 +21,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 2 files changed, 17 insertions(+) diff --git a/agent/agent.h b/agent/agent.h -index 56e13ec..d1abf26 100644 +index d32b892..4195d0c 100644 --- a/agent/agent.h +++ b/agent/agent.h -@@ -391,6 +391,7 @@ void *get_agent_scd_notify_event (void); +@@ -384,6 +384,7 @@ void *get_agent_scd_notify_event (void); #endif void agent_sighup_action (void); int map_pk_openpgp_to_gcry (int openpgp_algo); @@ -33,10 +33,10 @@ index 56e13ec..d1abf26 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 309e87c..2882767 100644 +index 5002abe..7c26aa6 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c -@@ -462,6 +462,9 @@ static int have_homedir_inotify; +@@ -459,6 +459,9 @@ static int have_homedir_inotify; * works reliable. */ static int reliable_homedir_inotify; @@ -46,7 +46,7 @@ index 309e87c..2882767 100644 /* Number of active connections. */ static int active_connections; -@@ -2470,6 +2473,10 @@ handle_signal (int signo) +@@ -2458,6 +2461,10 @@ handle_signal (int signo) agent_sigusr2_action (); break; @@ -57,7 +57,7 @@ index 309e87c..2882767 100644 case SIGTERM: if (!shutdown_pending) log_info ("SIGTERM received - shutting down ...\n"); -@@ -2808,6 +2815,13 @@ start_connection_thread_ssh (void *arg) +@@ -2796,6 +2803,13 @@ start_connection_thread_ssh (void *arg) } @@ -71,7 +71,7 @@ index 309e87c..2882767 100644 /* helper function for readability: test whether a given struct timespec is set to all-zeros */ static inline int -@@ -2877,8 +2891,10 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -2865,8 +2879,10 @@ handle_connections (gnupg_fd_t listen_fd, npth_sigev_add (SIGUSR1); npth_sigev_add (SIGUSR2); npth_sigev_add (SIGINT); diff --git a/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch b/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch index 34a91c6..bcbe802 100644 --- a/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch +++ b/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch @@ -12,10 +12,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 1 file changed, 2 insertions(+) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c -index 0801449..45d2e87 100644 +index a0d597f..d18b181 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c -@@ -3044,6 +3044,8 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -3032,6 +3032,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; diff --git a/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch index 5630aa7..7bcac2a 100644 --- a/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch +++ b/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch @@ -26,7 +26,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/agent/call-scd.c b/agent/call-scd.c -index c5b95f4..762de82 100644 +index cd66070..c4c4cbe 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -414,6 +414,8 @@ start_scd (ctrl_t ctrl) @@ -39,10 +39,10 @@ index c5b95f4..762de82 100644 leave: xfree (abs_homedir); diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c -index 2882767..0801449 100644 +index 7c26aa6..a0d597f 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c -@@ -2374,6 +2374,26 @@ create_directories (void) +@@ -2362,6 +2362,26 @@ create_directories (void) } @@ -69,7 +69,7 @@ index 2882767..0801449 100644 /* This is the worker for the ticker. It is called every few seconds and may only do fast operations. */ -@@ -2730,7 +2750,8 @@ do_start_connection_thread (ctrl_t ctrl) +@@ -2718,7 +2738,8 @@ do_start_connection_thread (ctrl_t ctrl) agent_deinit_default_ctrl (ctrl); xfree (ctrl); @@ -79,7 +79,7 @@ index 2882767..0801449 100644 return NULL; } -@@ -2810,7 +2831,8 @@ start_connection_thread_ssh (void *arg) +@@ -2798,7 +2819,8 @@ start_connection_thread_ssh (void *arg) agent_deinit_default_ctrl (ctrl); xfree (ctrl); @@ -89,7 +89,7 @@ index 2882767..0801449 100644 return NULL; } -@@ -3020,6 +3042,9 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -3008,6 +3030,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/agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch index 5b6e1ff..317fc82 100644 --- a/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch +++ b/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch @@ -31,10 +31,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c -index 3f7aaae..309e87c 100644 +index d747707..5002abe 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c -@@ -2377,12 +2377,8 @@ create_directories (void) +@@ -2365,12 +2365,8 @@ create_directories (void) static void handle_tick (void) { @@ -47,7 +47,7 @@ index 3f7aaae..309e87c 100644 /* Check whether the scdaemon has died and cleanup in this case. */ agent_scd_check_aliveness (); -@@ -2402,15 +2398,6 @@ handle_tick (void) +@@ -2390,15 +2386,6 @@ handle_tick (void) } #endif /*HAVE_W32_SYSTEM*/ @@ -63,7 +63,7 @@ index 3f7aaae..309e87c 100644 /* Need to check for expired cache entries. */ agent_cache_housekeeping (); -@@ -2821,6 +2808,15 @@ start_connection_thread_ssh (void *arg) +@@ -2809,6 +2796,15 @@ start_connection_thread_ssh (void *arg) } @@ -79,7 +79,7 @@ index 3f7aaae..309e87c 100644 /* Connection handler loop. Wait for connection requests and spawn a thread after accepting a connection. */ static void -@@ -2838,9 +2834,11 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -2826,9 +2822,11 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t fd; int nfd; int saved_errno; @@ -91,7 +91,7 @@ index 3f7aaae..309e87c 100644 #ifdef HAVE_W32_SYSTEM HANDLE events[2]; unsigned int events_set; -@@ -2857,6 +2855,14 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -2845,6 +2843,14 @@ handle_connections (gnupg_fd_t listen_fd, { "browser", start_connection_thread_browser }, { "ssh", start_connection_thread_ssh } }; @@ -106,7 +106,7 @@ index 3f7aaae..309e87c 100644 ret = npth_attr_init(&tattr); -@@ -2964,9 +2970,6 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -2952,9 +2958,6 @@ handle_connections (gnupg_fd_t listen_fd, listentbl[2].l_fd = listen_fd_browser; listentbl[3].l_fd = listen_fd_ssh; @@ -116,7 +116,7 @@ index 3f7aaae..309e87c 100644 for (;;) { /* Shutdown test. */ -@@ -3001,18 +3004,46 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -2989,18 +2992,46 @@ handle_connections (gnupg_fd_t listen_fd, thus a simple assignment is fine to copy the entire set. */ read_fdset = fdset; @@ -172,7 +172,7 @@ index 3f7aaae..309e87c 100644 npth_sigev_sigmask ()); saved_errno = errno; -@@ -3022,7 +3053,7 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -3010,7 +3041,7 @@ handle_connections (gnupg_fd_t listen_fd, handle_signal (signo); } #else @@ -181,7 +181,7 @@ index 3f7aaae..309e87c 100644 events, &events_set); saved_errno = errno; -@@ -3067,7 +3098,6 @@ handle_connections (gnupg_fd_t listen_fd, +@@ -3055,7 +3086,6 @@ handle_connections (gnupg_fd_t listen_fd, if (!shutdown_pending) { |