[Pkg-gnupg-commit] [gnupg2] 287/292: refresh patches to improve idling behavior of gpg-agent and dirmngr
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Nov 21 06:31:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 377faa4d88c076155746697f984955179917b83e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun Nov 20 23:20:54 2016 -0500
refresh patches to improve idling behavior of gpg-agent and dirmngr
---
...0002-Avoid-simple-memory-dumps-via-ptrace.patch | 8 ++--
.../debian-packaging/0001-avoid-beta-warning.patch | 2 +-
...regenerating-defsincdate-use-shipped-file.patch | 4 +-
...Avoid-potential-race-condition-when-some.patch} | 0
...-dimrngr-Avoid-need-for-hkp-housekeeping.patch} | 26 ++++++-------
...dirmngr-Lazily-launch-ldap-reaper-thread.patch} | 32 ++++++++-------
...void-automatically-checking-upstream-swdb.patch | 45 ++++++++++++++++++++++
...> 0005-dirmngr-Drop-useless-housekeeping.patch} | 39 ++++++++-----------
...ent-Create-framework-of-scheduled-timers.patch} | 20 +++++-----
...threads-to-interrupt-main-select-loop-wi.patch} | 14 +++----
...ent-Avoid-tight-timer-tick-when-possible.patch} | 8 ++--
...scheduled-checks-on-socket-when-inotify-.patch} | 4 +-
debian/patches/series | 17 ++++----
13 files changed, 128 insertions(+), 91 deletions(-)
diff --git a/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
index d32aef1..419ddce 100644
--- a/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0002-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 b8a5a3e..42073d9 100644
+index 1433f7f..84e6667 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index b8a5a3e..42073d9 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -741,6 +744,11 @@ main (int argc, char **argv )
+@@ -949,6 +952,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -47,10 +47,10 @@ index b8a5a3e..42073d9 100644
file descriptors and the signal mask. This info is required to
do the exec call properly. */
diff --git a/configure.ac b/configure.ac
-index 95a8f17..201b0b8 100644
+index 1b77a45..22e895f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1379,6 +1379,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1378,6 +1378,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/0001-avoid-beta-warning.patch b/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
index 049e365..5cbecf8 100644
--- a/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
+++ b/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
@@ -19,7 +19,7 @@ See discussion at:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 10cc203..debb220 100755
+index 92c6df8..6b631a2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
diff --git a/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch b/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
index e81572b..e652eb3 100644
--- a/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/0003-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 52ac398..8b6b1a5 100644
+index 53cd639..0ad353e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -157,13 +157,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+@@ -164,13 +164,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
dist-hook: defsincdate
diff --git a/debian/patches/dirmngr-idling/0142-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch b/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
similarity index 100%
rename from debian/patches/dirmngr-idling/0142-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
rename to debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
diff --git a/debian/patches/dirmngr-idling/0143-dimrngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
similarity index 93%
rename from debian/patches/dirmngr-idling/0143-dimrngr-Avoid-need-for-hkp-housekeeping.patch
rename to debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
index 82883e6..da9585f 100644
--- a/debian/patches/dirmngr-idling/0143-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
@@ -20,20 +20,21 @@ HOUSEKEEPING_INTERVAL seconds.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
- dirmngr/dirmngr.c | 4 ---
+ dirmngr/dirmngr.c | 3 --
dirmngr/dirmngr.h | 4 ---
dirmngr/ks-engine-hkp.c | 73 ++++++++++++++++++++++++-------------------------
- 3 files changed, 36 insertions(+), 45 deletions(-)
+ 3 files changed, 36 insertions(+), 44 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 042ac45..63561c1 100644
+index 7214d49..49a7835 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1751,11 +1751,9 @@ static void *
+@@ -1769,12 +1769,10 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
- time_t curtime;
+ struct server_control_s ctrlbuf;
(void)arg;
@@ -41,20 +42,19 @@ index 042ac45..63561c1 100644
if (sentinel)
{
log_info ("housekeeping is already going on\n");
-@@ -1765,8 +1763,6 @@ housekeeping_thread (void *arg)
- if (opt.verbose > 1)
- log_info ("starting housekeeping\n");
+@@ -1787,7 +1785,6 @@ housekeeping_thread (void *arg)
+ memset (&ctrlbuf, 0, sizeof ctrlbuf);
+ dirmngr_init_default_ctrl (&ctrlbuf);
- ks_hkp_housekeeping (curtime);
--
- if (opt.verbose > 1)
- log_info ("ready with housekeeping\n");
- sentinel--;
+ if (network_activity_seen)
+ {
+ network_activity_seen = 0;
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
-index 3b26c33..7ab0f57 100644
+index da1c4be..e556bb6 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
-@@ -186,10 +186,6 @@ void dirmngr_sighup_action (void);
+@@ -188,10 +188,6 @@ void dirmngr_sighup_action (void);
const char* dirmngr_get_current_socket_name (void);
diff --git a/debian/patches/dirmngr-idling/0145-dirmngr-Lazily-launch-ldap-reaper-thread.patch b/debian/patches/dirmngr-idling/0003-dirmngr-Lazily-launch-ldap-reaper-thread.patch
similarity index 83%
rename from debian/patches/dirmngr-idling/0145-dirmngr-Lazily-launch-ldap-reaper-thread.patch
rename to debian/patches/dirmngr-idling/0003-dirmngr-Lazily-launch-ldap-reaper-thread.patch
index 849e488..5aa2ee3 100644
--- a/debian/patches/dirmngr-idling/0145-dirmngr-Lazily-launch-ldap-reaper-thread.patch
+++ b/debian/patches/dirmngr-idling/0003-dirmngr-Lazily-launch-ldap-reaper-thread.patch
@@ -32,44 +32,44 @@ it.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
dirmngr/dirmngr.c | 18 ------------------
- dirmngr/ldap-wrapper.c | 7 ++++---
- 2 files changed, 4 insertions(+), 21 deletions(-)
+ dirmngr/ldap-wrapper.c | 5 +++--
+ 2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index a5f2570..f4589f4 100644
+index 49a7835..4ad4440 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -972,9 +972,6 @@ main (int argc, char **argv)
+@@ -989,9 +989,6 @@ main (int argc, char **argv)
thread_init ();
cert_cache_init ();
crl_cache_init ();
-#if USE_LDAP
- ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
+ http_register_netactivity_cb (netactivity_action);
start_command_handler (ASSUAN_INVALID_FD);
shutdown_reaper ();
- }
-@@ -1009,9 +1006,6 @@ main (int argc, char **argv)
+@@ -1027,9 +1024,6 @@ main (int argc, char **argv)
thread_init ();
cert_cache_init ();
crl_cache_init ();
-#if USE_LDAP
- ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
+ http_register_netactivity_cb (netactivity_action);
handle_connections (3);
assuan_sock_close (3);
- shutdown_reaper ();
-@@ -1209,9 +1203,6 @@ main (int argc, char **argv)
+@@ -1238,9 +1232,6 @@ main (int argc, char **argv)
thread_init ();
cert_cache_init ();
crl_cache_init ();
-#if USE_LDAP
- ldap_wrapper_launch_thread ();
-#endif /*USE_LDAP*/
+ http_register_netactivity_cb (netactivity_action);
handle_connections (fd);
assuan_sock_close (fd);
- shutdown_reaper ();
-@@ -1221,9 +1212,6 @@ main (int argc, char **argv)
+@@ -1251,9 +1242,6 @@ main (int argc, char **argv)
/* Just list the CRL cache and exit. */
if (argc)
wrong_args ("--list-crls");
@@ -79,7 +79,7 @@ index a5f2570..f4589f4 100644
crl_cache_init ();
crl_cache_list (es_stdout);
}
-@@ -1237,9 +1225,6 @@ main (int argc, char **argv)
+@@ -1267,9 +1255,6 @@ main (int argc, char **argv)
thread_init ();
cert_cache_init ();
crl_cache_init ();
@@ -89,7 +89,7 @@ index a5f2570..f4589f4 100644
if (!argc)
rc = crl_cache_load (&ctrlbuf, NULL);
else
-@@ -1263,9 +1248,6 @@ main (int argc, char **argv)
+@@ -1293,9 +1278,6 @@ main (int argc, char **argv)
thread_init ();
cert_cache_init ();
crl_cache_init ();
@@ -100,20 +100,18 @@ index a5f2570..f4589f4 100644
if (rc)
log_error (_("fetching CRL from '%s' failed: %s\n"),
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
-index b9931a0..ed7d24d 100644
+index b9931a0..b313848 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
-@@ -654,9 +654,10 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
+@@ -654,8 +654,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
only viable solutions are either to have another thread
responsible for logging the messages or to add an option to the
wrapper module to do the logging on its own. Given that we anyway
- need a way to rip the child process and this is best done using a
- general ripping thread, that thread can do the logging too. */
--
+ need a way to reap the child process and this is best done using a
+ general reaping thread, that thread can do the logging too. */
+ ldap_wrapper_launch_thread ();
-+
+
*reader = NULL;
- /* Files: We need to prepare stdin and stdout. We get stderr from
diff --git a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
new file mode 100644
index 0000000..18d393c
--- /dev/null
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
@@ -0,0 +1,45 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Sun, 20 Nov 2016 23:09:24 -0500
+Subject: dirmngr: Avoid automatically checking upstream swdb.
+
+* dirmngr/dirmngr.c (housekeeping_thread): Avoid automatically
+checking upstream's software database. In Debian, software updates
+should be handled by the distro mechanism, and additional upstream
+checks only confuse the user.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ dirmngr/dirmngr.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
+index 4ad4440..14ff05a 100644
+--- a/dirmngr/dirmngr.c
++++ b/dirmngr/dirmngr.c
+@@ -1751,7 +1751,6 @@ static void *
+ housekeeping_thread (void *arg)
+ {
+ static int sentinel;
+- struct server_control_s ctrlbuf;
+
+ (void)arg;
+
+@@ -1764,18 +1763,6 @@ housekeeping_thread (void *arg)
+ if (opt.verbose > 1)
+ log_info ("starting housekeeping\n");
+
+- memset (&ctrlbuf, 0, sizeof ctrlbuf);
+- dirmngr_init_default_ctrl (&ctrlbuf);
+-
+- if (network_activity_seen)
+- {
+- network_activity_seen = 0;
+- if (opt.use_tor || opt.allow_version_check)
+- dirmngr_load_swdb (&ctrlbuf, 0);
+- }
+-
+- dirmngr_deinit_default_ctrl (&ctrlbuf);
+-
+ if (opt.verbose > 1)
+ log_info ("ready with housekeeping\n");
+ sentinel--;
diff --git a/debian/patches/dirmngr-idling/0144-dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
similarity index 81%
rename from debian/patches/dirmngr-idling/0144-dirmngr-Drop-useless-housekeeping.patch
rename to debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
index 407de23..fca6b72 100644
--- a/debian/patches/dirmngr-idling/0144-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
@@ -10,40 +10,33 @@ housekeeping is necessary.
--
The housekeeping thread no longer does anything, and the main loop was
-waking up every two seconds for no good reason. The code is simpler
+waking up every 60 seconds for no good reason. The code is simpler
and the runtime is more efficient if we drop this.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
- dirmngr/dirmngr.c | 120 +++---------------------------------------------------
- 1 file changed, 5 insertions(+), 115 deletions(-)
+ dirmngr/dirmngr.c | 113 +++---------------------------------------------------
+ 1 file changed, 5 insertions(+), 108 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 63561c1..a5f2570 100644
+index 14ff05a..e03aa33 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -289,20 +289,6 @@ static int disable_check_own_socket;
- /* Counter for the active connections. */
- static int active_connections;
+@@ -296,13 +296,6 @@ static int active_connections;
+ * thread to run background network tasks. */
+ static int network_activity_seen;
--/* The timer tick used for housekeeping stuff. For Windows we use a
-- longer period as the SetWaitableTimer seems to signal earlier than
-- the 2 seconds. All values are in seconds. */
--#if defined(HAVE_W32CE_SYSTEM)
--# define TIMERTICK_INTERVAL (60)
--#elif defined(HAVE_W32_SYSTEM)
--# define TIMERTICK_INTERVAL (4)
--#else
--# define TIMERTICK_INTERVAL (2)
--#endif
+-/* The timer tick used for housekeeping stuff. */
+-#define TIMERTICK_INTERVAL (60)
-
+-/* How oft to run the housekeeping. */
-#define HOUSEKEEPING_INTERVAL (600)
-
-
/* 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.). */
-@@ -1746,83 +1732,6 @@ handle_signal (int signo)
+@@ -1746,83 +1739,6 @@ handle_signal (int signo)
#endif /*!HAVE_W32_SYSTEM*/
@@ -127,7 +120,7 @@ index 63561c1..a5f2570 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
-@@ -1922,9 +1831,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1922,9 +1838,6 @@ handle_connections (assuan_fd_t listen_fd)
gnupg_fd_t fd;
int nfd, ret;
fd_set fdset, read_fdset;
@@ -137,7 +130,7 @@ index 63561c1..a5f2570 100644
int saved_errno;
#ifdef HAVE_INOTIFY_INIT
int my_inotify_fd;
-@@ -1966,9 +1872,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1966,9 +1879,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/
@@ -148,7 +141,7 @@ index 63561c1..a5f2570 100644
FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd);
-@@ -1981,9 +1885,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1981,9 +1892,6 @@ handle_connections (assuan_fd_t listen_fd)
}
#endif /*HAVE_INOTIFY_INIT*/
@@ -158,7 +151,7 @@ index 63561c1..a5f2570 100644
/* Main loop. */
for (;;)
{
-@@ -1994,31 +1895,21 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1994,31 +1902,21 @@ handle_connections (assuan_fd_t listen_fd)
break; /* ready */
/* Do not accept new connections but keep on running the
@@ -193,7 +186,7 @@ index 63561c1..a5f2570 100644
saved_errno = errno;
#endif
-@@ -2032,8 +1923,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2032,8 +1930,7 @@ handle_connections (assuan_fd_t listen_fd)
if (ret <= 0)
{
diff --git a/debian/patches/gpg-agent-idling/0137-agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
similarity index 90%
rename from debian/patches/gpg-agent-idling/0137-agent-Create-framework-of-scheduled-timers.patch
rename to debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
index 92054b8..2807fcd 100644
--- a/debian/patches/gpg-agent-idling/0137-agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
@@ -31,10 +31,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 58 insertions(+), 29 deletions(-)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index a8ab103..5d4611f 100644
+index 84e6667..c014289 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2252,11 +2252,6 @@ create_directories (void)
+@@ -2269,11 +2269,6 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -46,7 +46,7 @@ index a8ab103..5d4611f 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2275,16 +2270,6 @@ handle_tick (void)
+@@ -2292,16 +2287,6 @@ handle_tick (void)
}
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index a8ab103..5d4611f 100644
}
-@@ -2681,6 +2666,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2698,6 +2683,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index a8ab103..5d4611f 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2698,9 +2692,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2715,9 +2709,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index a8ab103..5d4611f 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2716,6 +2712,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2733,6 +2729,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index a8ab103..5d4611f 100644
ret = npth_attr_init(&tattr);
-@@ -2805,9 +2809,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2822,9 +2826,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 a8ab103..5d4611f 100644
for (;;)
{
/* Shutdown test. */
-@@ -2825,18 +2826,47 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2842,18 +2843,47 @@ handle_connections (gnupg_fd_t listen_fd,
thus a simple assignment is fine to copy the entire set. */
read_fdset = fdset;
@@ -173,7 +173,7 @@ index a8ab103..5d4611f 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2846,7 +2876,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2863,7 +2893,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -182,7 +182,7 @@ index a8ab103..5d4611f 100644
events, &events_set);
saved_errno = errno;
-@@ -2869,7 +2899,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2886,7 +2916,6 @@ handle_connections (gnupg_fd_t listen_fd,
if (!shutdown_pending)
{
diff --git a/debian/patches/gpg-agent-idling/0138-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
similarity index 88%
rename from debian/patches/gpg-agent-idling/0138-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
rename to debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index a1015bd..fad6d17 100644
--- a/debian/patches/gpg-agent-idling/0138-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
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/agent/agent.h b/agent/agent.h
-index 9ba7dc8..bca4e0b 100644
+index 2dfbf5c..42fcd89 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -347,6 +347,7 @@ void *get_agent_scd_notify_event (void);
@@ -33,7 +33,7 @@ index 9ba7dc8..bca4e0b 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 5d4611f..2240543 100644
+index c014289..28d24eb 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -383,6 +383,9 @@ static char *current_logfile;
@@ -46,7 +46,7 @@ index 5d4611f..2240543 100644
/* Number of active connections. */
static int active_connections;
-@@ -2002,7 +2005,7 @@ get_agent_scd_notify_event (void)
+@@ -2019,7 +2022,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index 5d4611f..2240543 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2328,6 +2331,10 @@ handle_signal (int signo)
+@@ -2345,6 +2348,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index 5d4611f..2240543 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2666,6 +2673,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2683,6 +2690,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index 5d4611f..2240543 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2734,8 +2748,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2751,8 +2765,10 @@ handle_connections (gnupg_fd_t listen_fd,
npth_sigev_add (SIGUSR1);
npth_sigev_add (SIGUSR2);
npth_sigev_add (SIGINT);
@@ -91,7 +91,7 @@ index 5d4611f..2240543 100644
#else
# ifdef HAVE_W32CE_SYSTEM
/* Use a dummy event. */
-@@ -2747,6 +2763,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2764,6 +2780,7 @@ handle_connections (gnupg_fd_t listen_fd,
# endif
#endif
diff --git a/debian/patches/gpg-agent-idling/0139-agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
similarity index 93%
rename from debian/patches/gpg-agent-idling/0139-agent-Avoid-tight-timer-tick-when-possible.patch
rename to debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
index f4a396a..6f2b199 100644
--- a/debian/patches/gpg-agent-idling/0139-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
@@ -36,10 +36,10 @@ index ba59c18..1ac0f6b 100644
xfree (abs_homedir);
if (err)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 2240543..506bc95 100644
+index 28d24eb..4a3ee28 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2249,6 +2249,26 @@ create_directories (void)
+@@ -2266,6 +2266,26 @@ create_directories (void)
}
@@ -66,7 +66,7 @@ index 2240543..506bc95 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2307,7 +2327,7 @@ agent_sigusr2_action (void)
+@@ -2324,7 +2344,7 @@ agent_sigusr2_action (void)
#ifndef HAVE_W32_SYSTEM
/* The signal handler for this program. It is expected to be run in
@@ -75,7 +75,7 @@ index 2240543..506bc95 100644
static void
handle_signal (int signo)
{
-@@ -2843,6 +2863,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2860,6 +2880,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/0140-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
similarity index 91%
rename from debian/patches/gpg-agent-idling/0140-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
rename to debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 482b818..e8b57e7 100644
--- a/debian/patches/gpg-agent-idling/0140-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 506bc95..4f2d711 100644
+index 4a3ee28..2bc70e3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2865,6 +2865,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2882,6 +2882,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/series b/debian/patches/series
index 62226cd..2dded98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,12 @@
debian-packaging/0001-avoid-beta-warning.patch
block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
-gpg-agent-idling/0137-agent-Create-framework-of-scheduled-timers.patch
-gpg-agent-idling/0138-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
-gpg-agent-idling/0139-agent-Avoid-tight-timer-tick-when-possible.patch
-gpg-agent-idling/0140-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
-dirmngr-idling/0142-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
-dirmngr-idling/0143-dimrngr-Avoid-need-for-hkp-housekeeping.patch
-dirmngr-idling/0144-dirmngr-Drop-useless-housekeeping.patch
-dirmngr-idling/0145-dirmngr-Lazily-launch-ldap-reaper-thread.patch
+dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+dirmngr-idling/0003-dirmngr-Lazily-launch-ldap-reaper-thread.patch
+dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
+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
--
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