[Pkg-gnupg-commit] [gnupg2] 122/124: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Apr 5 15:55:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit ca39ff64ddb61ccdcb437f4fe87cb6319ebe735a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Apr 5 11:39:21 2017 -0400
refresh patches
---
...0003-Avoid-simple-memory-dumps-via-ptrace.patch | 8 +++----
...regenerating-defsincdate-use-shipped-file.patch | 4 ++--
...-Avoid-potential-race-condition-when-some.patch | 2 +-
...5-dirmngr-Avoid-need-for-hkp-housekeeping.patch | 26 +++++++++++-----------
...void-automatically-checking-upstream-swdb.patch | 8 +++----
.../0007-dirmngr-Drop-useless-housekeeping.patch | 18 +++++++--------
...gent-Create-framework-of-scheduled-timers.patch | 20 ++++++++---------
...-threads-to-interrupt-main-select-loop-wi.patch | 16 ++++++-------
...gent-Avoid-tight-timer-tick-when-possible.patch | 14 ++++++------
...-scheduled-checks-on-socket-when-inotify-.patch | 4 ++--
10 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index 5e02751..b0a8242 100644
--- a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -21,7 +21,7 @@ Upstream bug: https://bugs.gnupg.org/gnupg/issue1211
2 files changed, 9 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 5a5b55b..3507654 100644
+index e23f438..6895358 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index 5a5b55b..3507654 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -949,6 +952,11 @@ main (int argc, char **argv )
+@@ -956,6 +959,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -47,10 +47,10 @@ index 5a5b55b..3507654 100644
file descriptors and the signal mask. This info is required to
do the exec call properly. We don't need it on Windows. */
diff --git a/configure.ac b/configure.ac
-index 4b9ceca..a793a7e 100644
+index df7a059..33cad0e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1351,6 +1351,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1356,6 +1356,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
AC_CHECK_FUNCS([strcasecmp strncasecmp ctermid times gmtime_r strtoull])
AC_CHECK_FUNCS([setenv unsetenv fcntl ftruncate inet_ntop])
AC_CHECK_FUNCS([canonicalize_file_name])
diff --git a/debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch b/debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
index e3016a2..53a81c1 100644
--- a/debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -18,10 +18,10 @@ the datestamp unreproducible.
1 file changed, 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 0c2f2c9..65b941c 100644
+index 0c78284..9815096 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -167,13 +167,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+@@ -168,13 +168,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
dist-hook: defsincdate
diff --git a/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch b/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index fd3fefb..110092b 100644
--- a/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index b6a0675..b9f2980 100644
+index 1592fab..f7a8756 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -206,25 +206,24 @@ host_in_pool_p (int *pool, int tblidx)
diff --git a/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
index 1101ba8..a49e9d7 100644
--- a/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
@@ -26,10 +26,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
3 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index c877a9b..13771a4 100644
+index 07b3b91..e3c1c3e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1850,12 +1850,10 @@ static void *
+@@ -1861,12 +1861,10 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -42,7 +42,7 @@ index c877a9b..13771a4 100644
if (sentinel)
{
log_info ("housekeeping is already going on\n");
-@@ -1868,7 +1866,6 @@ housekeeping_thread (void *arg)
+@@ -1879,7 +1877,6 @@ housekeeping_thread (void *arg)
memset (&ctrlbuf, 0, sizeof ctrlbuf);
dirmngr_init_default_ctrl (&ctrlbuf);
@@ -51,10 +51,10 @@ index c877a9b..13771a4 100644
{
network_activity_seen = 0;
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
-index b269865..27cc2ea 100644
+index e10de09..e9be4fb 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
-@@ -206,7 +206,6 @@ const char* dirmngr_get_current_socket_name (void);
+@@ -207,7 +207,6 @@ const char* dirmngr_get_current_socket_name (void);
int dirmngr_use_tor (void);
/*-- Various housekeeping functions. --*/
@@ -63,7 +63,7 @@ index b269865..27cc2ea 100644
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index b9f2980..96c625c 100644
+index f7a8756..3b78d1a 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -200,6 +200,25 @@ host_in_pool_p (int *pool, int tblidx)
@@ -115,7 +115,7 @@ index b9f2980..96c625c 100644
*r_host = NULL;
if (r_httpflags)
-@@ -538,6 +560,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -540,6 +562,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
xfree (reftbl);
}
@@ -123,7 +123,7 @@ index b9f2980..96c625c 100644
hi = hosttable[idx];
if (hi->pool)
{
-@@ -554,7 +577,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -556,7 +579,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
if (force_reselect)
hi->poolidx = -1;
else if (hi->poolidx >= 0 && hi->poolidx < hosttable_size
@@ -132,7 +132,7 @@ index b9f2980..96c625c 100644
hi->poolidx = -1;
/* Select a host if needed. */
-@@ -607,7 +630,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -609,7 +632,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
free_dns_addrinfo (aibuf);
}
@@ -141,7 +141,7 @@ index b9f2980..96c625c 100644
{
log_error ("host '%s' marked as dead\n", hi->name);
if (r_httphost)
-@@ -712,7 +735,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -714,7 +737,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
{
gpg_error_t err = 0;
hostinfo_t hi, hi2;
@@ -151,7 +151,7 @@ index b9f2980..96c625c 100644
if (!name || !*name || !strcmp (name, "localhost"))
return 0;
-@@ -721,13 +745,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -723,13 +747,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
if (idx == -1)
return gpg_error (GPG_ERR_NOT_FOUND);
@@ -169,7 +169,7 @@ index b9f2980..96c625c 100644
{
hi->dead = 1;
hi->died_at = 0; /* Manually set dead. */
-@@ -759,14 +785,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -761,14 +787,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
hi2 = hosttable[n];
if (!hi2)
@@ -188,7 +188,7 @@ index b9f2980..96c625c 100644
{
hi2->dead = 1;
hi2->died_at = 0; /* Manually set dead. */
-@@ -1049,34 +1076,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
+@@ -1051,34 +1078,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
}
diff --git a/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index cc4ca27..36d5895 100644
--- a/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
@@ -15,10 +15,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 13771a4..25fcd2c 100644
+index e3c1c3e..febb56d 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1850,7 +1850,6 @@ static void *
+@@ -1861,7 +1861,6 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -26,7 +26,7 @@ index 13771a4..25fcd2c 100644
(void)arg;
-@@ -1863,18 +1862,6 @@ housekeeping_thread (void *arg)
+@@ -1874,18 +1873,6 @@ housekeeping_thread (void *arg)
if (opt.verbose > 1)
log_info ("starting housekeeping\n");
@@ -46,7 +46,7 @@ index 13771a4..25fcd2c 100644
log_info ("ready with housekeeping\n");
sentinel--;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index 7a6ba47..95a0364 100644
+index 027bb94..403ecae 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -266,9 +266,10 @@ seconds.
diff --git a/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
index 70774ca..713e503 100644
--- a/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
@@ -19,10 +19,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 5 insertions(+), 108 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 25fcd2c..6ab3447 100644
+index febb56d..3972977 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -324,13 +324,6 @@ static int network_activity_seen;
+@@ -327,13 +327,6 @@ static int network_activity_seen;
static strlist_t hkp_cacert_filenames;
@@ -36,7 +36,7 @@ index 25fcd2c..6ab3447 100644
/* This union is used to avoid compiler warnings in case a pointer is
64 bit and an int 32 bit. We store an integer in a pointer and get
it back later (npth_getspecific et al.). */
-@@ -1845,83 +1838,6 @@ handle_signal (int signo)
+@@ -1856,83 +1849,6 @@ handle_signal (int signo)
#endif /*!HAVE_W32_SYSTEM*/
@@ -120,7 +120,7 @@ index 25fcd2c..6ab3447 100644
/* Check the nonce on a new connection. This is a NOP unless we are
using our Unix domain socket emulation under Windows. */
static int
-@@ -2022,9 +1938,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2033,9 +1949,6 @@ handle_connections (assuan_fd_t listen_fd)
gnupg_fd_t fd;
int nfd, ret;
fd_set fdset, read_fdset;
@@ -130,7 +130,7 @@ index 25fcd2c..6ab3447 100644
int saved_errno;
int my_inotify_fd = -1;
-@@ -2064,9 +1977,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2075,9 +1988,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/
@@ -141,7 +141,7 @@ index 25fcd2c..6ab3447 100644
FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd);
-@@ -2077,9 +1988,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2088,9 +1999,6 @@ handle_connections (assuan_fd_t listen_fd)
nfd = my_inotify_fd;
}
@@ -151,7 +151,7 @@ index 25fcd2c..6ab3447 100644
/* Main loop. */
for (;;)
{
-@@ -2090,7 +1998,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2101,7 +2009,7 @@ handle_connections (assuan_fd_t listen_fd)
break; /* ready */
/* Do not accept new connections but keep on running the
@@ -160,7 +160,7 @@ index 25fcd2c..6ab3447 100644
*
* Note that we do not close the listening socket because a
* client trying to connect to that socket would instead
-@@ -2110,24 +2018,14 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2121,24 +2029,14 @@ handle_connections (assuan_fd_t listen_fd)
/* Take a copy of the fdset. */
read_fdset = fdset;
@@ -187,7 +187,7 @@ index 25fcd2c..6ab3447 100644
saved_errno = errno;
#endif
-@@ -2141,8 +2039,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2152,8 +2050,7 @@ handle_connections (assuan_fd_t listen_fd)
if (ret <= 0)
{
diff --git a/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
index 5361a35..1af78fe 100644
--- a/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
@@ -31,10 +31,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 57 insertions(+), 29 deletions(-)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 3507654..7d7cdc2 100644
+index 6895358..332285f 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2282,11 +2282,6 @@ create_directories (void)
+@@ -2291,11 +2291,6 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -46,7 +46,7 @@ index 3507654..7d7cdc2 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2305,16 +2300,6 @@ handle_tick (void)
+@@ -2314,16 +2309,6 @@ handle_tick (void)
}
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index 3507654..7d7cdc2 100644
}
-@@ -2711,6 +2696,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2720,6 +2705,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index 3507654..7d7cdc2 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2728,9 +2722,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2737,9 +2731,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index 3507654..7d7cdc2 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2746,6 +2742,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2755,6 +2751,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index 3507654..7d7cdc2 100644
ret = npth_attr_init(&tattr);
-@@ -2835,9 +2839,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2844,9 +2848,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 3507654..7d7cdc2 100644
for (;;)
{
/* Shutdown test. */
-@@ -2866,18 +2867,46 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2875,18 +2876,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 3507654..7d7cdc2 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2887,7 +2916,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2896,7 +2925,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -181,7 +181,7 @@ index 3507654..7d7cdc2 100644
events, &events_set);
saved_errno = errno;
-@@ -2910,7 +2939,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2919,7 +2948,6 @@ handle_connections (gnupg_fd_t listen_fd,
if (!shutdown_pending)
{
diff --git a/debian/patches/gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch b/debian/patches/gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 6191c85..1bf9311 100644
--- a/debian/patches/gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+++ b/debian/patches/gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
@@ -21,10 +21,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/agent/agent.h b/agent/agent.h
-index e98a246..be7f7b2 100644
+index 01e675b..fadc8e8 100644
--- a/agent/agent.h
+++ b/agent/agent.h
-@@ -346,6 +346,7 @@ void *get_agent_scd_notify_event (void);
+@@ -349,6 +349,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 e98a246..be7f7b2 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 7d7cdc2..7e2cacd 100644
+index 332285f..2e97188 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -384,6 +384,9 @@ static char *current_logfile;
+@@ -386,6 +386,9 @@ static char *current_logfile;
watched. */
static pid_t parent_pid = (pid_t)(-1);
@@ -46,7 +46,7 @@ index 7d7cdc2..7e2cacd 100644
/* Number of active connections. */
static int active_connections;
-@@ -2032,7 +2035,7 @@ get_agent_scd_notify_event (void)
+@@ -2041,7 +2044,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index 7d7cdc2..7e2cacd 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2358,6 +2361,10 @@ handle_signal (int signo)
+@@ -2367,6 +2370,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index 7d7cdc2..7e2cacd 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2696,6 +2703,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2705,6 +2712,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index 7d7cdc2..7e2cacd 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2764,8 +2778,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2773,8 +2787,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/0010-agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
index 2e359bf..ed3a39f 100644
--- a/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/agent/call-scd.c b/agent/call-scd.c
-index c86eb74..7dcd982 100644
+index 09ec4fd..c27fe87 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -415,6 +415,8 @@ start_scd (ctrl_t ctrl)
@@ -39,10 +39,10 @@ index c86eb74..7dcd982 100644
leave:
xfree (abs_homedir);
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 7e2cacd..621cc89 100644
+index 2e97188..407cc09 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2279,6 +2279,26 @@ create_directories (void)
+@@ -2288,6 +2288,26 @@ create_directories (void)
}
@@ -69,7 +69,7 @@ index 7e2cacd..621cc89 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2337,7 +2357,7 @@ agent_sigusr2_action (void)
+@@ -2346,7 +2366,7 @@ agent_sigusr2_action (void)
#ifndef HAVE_W32_SYSTEM
/* The signal handler for this program. It is expected to be run in
@@ -78,7 +78,7 @@ index 7e2cacd..621cc89 100644
static void
handle_signal (int signo)
{
-@@ -2618,7 +2638,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2627,7 +2647,8 @@ do_start_connection_thread (ctrl_t ctrl)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -88,7 +88,7 @@ index 7e2cacd..621cc89 100644
return NULL;
}
-@@ -2698,7 +2719,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2707,7 +2728,8 @@ start_connection_thread_ssh (void *arg)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -98,7 +98,7 @@ index 7e2cacd..621cc89 100644
return NULL;
}
-@@ -2883,6 +2905,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2892,6 +2914,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/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch b/debian/patches/gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 2316245..ae632ae 100644
--- a/debian/patches/gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+++ b/debian/patches/gpg-agent-idling/0011-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 621cc89..0f3884c 100644
+index 407cc09..c16d9a3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2907,6 +2907,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2916,6 +2916,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
More information about the Pkg-gnupg-commit
mailing list