[Pkg-gnupg-commit] [gnupg2] 163/166: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu Mar 16 22:33:20 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 15dc3edd2672f38cd9664c89935bc9df03e47744
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun Mar 5 02:16:53 2017 +0100
refresh patches
---
...003-Avoid-simple-memory-dumps-via-ptrace.patch} | 6 ++--
.../debian-packaging/0001-avoid-beta-warning.patch | 2 +-
...egenerating-defsincdate-use-shipped-file.patch} | 2 +-
...oid-automatically-checking-upstream-swdb.patch} | 38 ++++++++++------------
.../0007-dirmngr-Drop-useless-housekeeping.patch} | 22 ++++++-------
...Avoid-potential-race-condition-when-some.patch} | 4 +--
...-dimrngr-Avoid-need-for-hkp-housekeeping.patch} | 34 +++++++++----------
...ent-Create-framework-of-scheduled-timers.patch} | 13 ++++----
...threads-to-interrupt-main-select-loop-wi.patch} | 6 ++--
...ent-Avoid-tight-timer-tick-when-possible.patch} | 14 ++++----
...scheduled-checks-on-socket-when-inotify-.patch} | 2 +-
debian/patches/series | 20 ++++++------
12 files changed, 78 insertions(+), 85 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/0003-Avoid-simple-memory-dumps-via-ptrace.patch
similarity index 93%
rename from debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
rename to debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index 96a8e0d..5e02751 100644
--- a/debian/patches/block-ptrace-on-agent/0002-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 c0208cc88..31bf3370a 100644
+index 5a5b55b..3507654 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -47,10 +47,10 @@ index c0208cc88..31bf3370a 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 f929cb60f..f2b6a70d2 100644
+index 4b9ceca..a793a7e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1335,6 +1335,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1351,6 +1351,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 ea08ce8..b9e0c31 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 e5ba5bf05..d7bab0383 100755
+index e5ba5bf..d7bab03 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -229,7 +229,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/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
similarity index 97%
rename from debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
rename to debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
index c141e4f..e3016a2 100644
--- a/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -18,7 +18,7 @@ the datestamp unreproducible.
1 file changed, 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 0c2f2c9dc..65b941ca7 100644
+index 0c2f2c9..65b941c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -167,13 +167,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
diff --git a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dimrngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
similarity index 60%
rename from debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
rename to debian/patches/dimrngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index 7791852..cc4ca27 100644
--- a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dimrngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
@@ -11,14 +11,14 @@ checks only confuse the user.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
dirmngr/dirmngr.c | 13 -------------
- doc/dirmngr.texi | 11 +++++------
- 2 files changed, 5 insertions(+), 19 deletions(-)
+ doc/dirmngr.texi | 7 ++++---
+ 2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index a8be56fa4..746f43d10 100644
+index 13771a4..25fcd2c 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1771,7 +1771,6 @@ static void *
+@@ -1850,7 +1850,6 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -26,7 +26,7 @@ index a8be56fa4..746f43d10 100644
(void)arg;
-@@ -1784,18 +1783,6 @@ housekeeping_thread (void *arg)
+@@ -1863,18 +1862,6 @@ housekeeping_thread (void *arg)
if (opt.verbose > 1)
log_info ("starting housekeeping\n");
@@ -36,7 +36,7 @@ index a8be56fa4..746f43d10 100644
- if (network_activity_seen)
- {
- network_activity_seen = 0;
-- if (opt.use_tor || opt.allow_version_check)
+- if (opt.allow_version_check)
- dirmngr_load_swdb (&ctrlbuf, 0);
- }
-
@@ -46,24 +46,20 @@ index a8be56fa4..746f43d10 100644
log_info ("ready with housekeeping\n");
sentinel--;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index e27157c00..dd104273d 100644
+index 7a6ba47..95a0364 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
-@@ -266,12 +266,11 @@ seconds.
+@@ -266,9 +266,10 @@ seconds.
@item --allow-version-check
@opindex allow-version-check
Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
--the list of current software versions. If this option is enabled, or
--if @option{use-tor} is active, the list is retrieved when the local
+-the list of current software versions. If this option is enabled
+-the list is retrieved in case the local
-copy does not exist or is older than 5 to 7 days. See the option
-- at option{--query-swdb} of the command @command{gpgconf} for more
--details. Note, that regardless of this option a version check can
--always be triggered using this command:
-+the list of current software versions. On debian-packaged versions,
-+this option does nothing since software updates should be handled by
-+the distribution. See the option @option{--query-swdb} of the command
-+ at command{gpgconf} for more details. Note, that regardless of this
-+option a version check can always be triggered using this command:
-
- @example
- gpg-connect-agent --dirmngr 'loadswdb --force' /bye
++the list of current software versions.
++On debian-packaged versions, this option does nothing since software
++updates should be handled by the distribution.
++See the option
+ @option{--query-swdb} of the command @command{gpgconf} for more
+ details. Note, that regardless of this option a version check can
+ always be triggered using this command:
diff --git a/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dimrngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
similarity index 89%
rename from debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
rename to debian/patches/dimrngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
index 69bdc9d..70774ca 100644
--- a/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dimrngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
@@ -19,12 +19,12 @@ 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 746f43d10..8d9de9e5a 100644
+index 25fcd2c..6ab3447 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -304,13 +304,6 @@ static int active_connections;
- * thread to run background network tasks. */
- static int network_activity_seen;
+@@ -324,13 +324,6 @@ static int network_activity_seen;
+ static strlist_t hkp_cacert_filenames;
+
-/* The timer tick used for housekeeping stuff. */
-#define TIMERTICK_INTERVAL (60)
@@ -36,7 +36,7 @@ index 746f43d10..8d9de9e5a 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.). */
-@@ -1766,83 +1759,6 @@ handle_signal (int signo)
+@@ -1845,83 +1838,6 @@ handle_signal (int signo)
#endif /*!HAVE_W32_SYSTEM*/
@@ -120,7 +120,7 @@ index 746f43d10..8d9de9e5a 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
-@@ -1943,9 +1859,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2022,9 +1938,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 746f43d10..8d9de9e5a 100644
int saved_errno;
int my_inotify_fd = -1;
-@@ -1985,9 +1898,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2064,9 +1977,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/
@@ -141,7 +141,7 @@ index 746f43d10..8d9de9e5a 100644
FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd);
-@@ -1998,9 +1909,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2077,9 +1988,6 @@ handle_connections (assuan_fd_t listen_fd)
nfd = my_inotify_fd;
}
@@ -151,7 +151,7 @@ index 746f43d10..8d9de9e5a 100644
/* Main loop. */
for (;;)
{
-@@ -2011,7 +1919,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2090,7 +1998,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 746f43d10..8d9de9e5a 100644
*
* Note that we do not close the listening socket because a
* client trying to connect to that socket would instead
-@@ -2031,24 +1939,14 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2110,24 +2018,14 @@ handle_connections (assuan_fd_t listen_fd)
/* Take a copy of the fdset. */
read_fdset = fdset;
@@ -187,7 +187,7 @@ index 746f43d10..8d9de9e5a 100644
saved_errno = errno;
#endif
-@@ -2062,8 +1960,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2141,8 +2039,7 @@ handle_connections (assuan_fd_t listen_fd)
if (ret <= 0)
{
diff --git a/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch b/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
similarity index 96%
rename from debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
rename to debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index f1bcde3..fd3fefb 100644
--- a/debian/patches/dirmngr-idling/0001-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,10 +36,10 @@ 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 45965cecc..57e7529f3 100644
+index b6a0675..b9f2980 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
-@@ -209,25 +209,24 @@ host_in_pool_p (int *pool, int tblidx)
+@@ -206,25 +206,24 @@ host_in_pool_p (int *pool, int tblidx)
static int
select_random_host (int *table)
{
diff --git a/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/0005-dimrngr-Avoid-need-for-hkp-housekeeping.patch
similarity index 86%
rename from debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
rename to debian/patches/dirmngr-idling/0005-dimrngr-Avoid-need-for-hkp-housekeeping.patch
index c23485c..d9f8cd3 100644
--- a/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dimrngr-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 061cfc300..a8be56fa4 100644
+index c877a9b..13771a4 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1771,12 +1771,10 @@ static void *
+@@ -1850,12 +1850,10 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -42,7 +42,7 @@ index 061cfc300..a8be56fa4 100644
if (sentinel)
{
log_info ("housekeeping is already going on\n");
-@@ -1789,7 +1787,6 @@ housekeeping_thread (void *arg)
+@@ -1868,7 +1866,6 @@ housekeeping_thread (void *arg)
memset (&ctrlbuf, 0, sizeof ctrlbuf);
dirmngr_init_default_ctrl (&ctrlbuf);
@@ -51,11 +51,11 @@ index 061cfc300..a8be56fa4 100644
{
network_activity_seen = 0;
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
-index 35bc000fb..acd4c636d 100644
+index b269865..27cc2ea 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
-@@ -193,7 +193,6 @@ const char* dirmngr_get_current_socket_name (void);
-
+@@ -206,7 +206,6 @@ const char* dirmngr_get_current_socket_name (void);
+ int dirmngr_use_tor (void);
/*-- Various housekeeping functions. --*/
-void ks_hkp_housekeeping (time_t curtime);
@@ -63,10 +63,10 @@ index 35bc000fb..acd4c636d 100644
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 57e7529f3..2b90441e2 100644
+index b9f2980..96c625c 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
-@@ -203,6 +203,25 @@ host_in_pool_p (int *pool, int tblidx)
+@@ -200,6 +200,25 @@ host_in_pool_p (int *pool, int tblidx)
}
@@ -92,7 +92,7 @@ index 57e7529f3..2b90441e2 100644
/* Select a random host. Consult TABLE which indices into the global
hosttable. Returns index into TABLE or -1 if no host could be
selected. */
-@@ -212,11 +231,13 @@ select_random_host (int *table)
+@@ -209,11 +228,13 @@ select_random_host (int *table)
int *tbl = NULL;
size_t tblsize = 0;
int pidx, idx;
@@ -107,7 +107,7 @@ index 57e7529f3..2b90441e2 100644
{
tblsize++;
tbl = xtryrealloc(tbl, tblsize * sizeof *tbl);
-@@ -395,6 +416,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -398,6 +419,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
gpg_error_t err = 0;
hostinfo_t hi;
int idx;
@@ -115,7 +115,7 @@ index 57e7529f3..2b90441e2 100644
*r_host = NULL;
if (r_httpflags)
-@@ -531,6 +553,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -538,6 +560,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
xfree (reftbl);
}
@@ -123,7 +123,7 @@ index 57e7529f3..2b90441e2 100644
hi = hosttable[idx];
if (hi->pool)
{
-@@ -547,7 +570,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -554,7 +577,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 57e7529f3..2b90441e2 100644
hi->poolidx = -1;
/* Select a host if needed. */
-@@ -599,7 +622,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+@@ -607,7 +630,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
free_dns_addrinfo (aibuf);
}
@@ -141,7 +141,7 @@ index 57e7529f3..2b90441e2 100644
{
log_error ("host '%s' marked as dead\n", hi->name);
if (r_httphost)
-@@ -704,7 +727,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -712,7 +735,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 57e7529f3..2b90441e2 100644
if (!name || !*name || !strcmp (name, "localhost"))
return 0;
-@@ -713,13 +737,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -721,13 +745,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 57e7529f3..2b90441e2 100644
{
hi->dead = 1;
hi->died_at = 0; /* Manually set dead. */
-@@ -751,14 +777,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -759,14 +785,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
hi2 = hosttable[n];
if (!hi2)
@@ -188,7 +188,7 @@ index 57e7529f3..2b90441e2 100644
{
hi2->dead = 1;
hi2->died_at = 0; /* Manually set dead. */
-@@ -974,34 +1001,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
+@@ -1049,34 +1076,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
}
diff --git a/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
similarity index 94%
rename from debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
rename to debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
index 05817dd..5361a35 100644
--- a/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
@@ -27,11 +27,11 @@ any regularly-scheduled timeout.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
- agent/gpg-agent.c | 87 ++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 58 insertions(+), 29 deletions(-)
+ agent/gpg-agent.c | 86 ++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 57 insertions(+), 29 deletions(-)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 31bf3370a..25aae6af0 100644
+index 3507654..7d7cdc2 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2282,11 +2282,6 @@ create_directories (void)
@@ -116,7 +116,7 @@ index 31bf3370a..25aae6af0 100644
for (;;)
{
/* Shutdown test. */
-@@ -2866,18 +2867,47 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2866,18 +2867,46 @@ handle_connections (gnupg_fd_t listen_fd,
thus a simple assignment is fine to copy the entire set. */
read_fdset = fdset;
@@ -165,7 +165,6 @@ index 31bf3370a..25aae6af0 100644
+ }
+ else
+ select_timeout = NULL;
-+
#ifndef HAVE_W32_SYSTEM
- ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
@@ -173,7 +172,7 @@ index 31bf3370a..25aae6af0 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2887,7 +2917,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2887,7 +2916,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -182,7 +181,7 @@ index 31bf3370a..25aae6af0 100644
events, &events_set);
saved_errno = errno;
-@@ -2910,7 +2940,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2910,7 +2939,6 @@ handle_connections (gnupg_fd_t listen_fd,
if (!shutdown_pending)
{
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/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
similarity index 95%
rename from debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
rename to debian/patches/gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 317cea5..6191c85 100644
--- a/debian/patches/gpg-agent-idling/0002-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 2db5a5c74..4e75b2a56 100644
+index e98a246..be7f7b2 100644
--- a/agent/agent.h
+++ b/agent/agent.h
-@@ -345,6 +345,7 @@ void *get_agent_scd_notify_event (void);
+@@ -346,6 +346,7 @@ void *get_agent_scd_notify_event (void);
#endif
void agent_sighup_action (void);
int map_pk_openpgp_to_gcry (int openpgp_algo);
@@ -33,7 +33,7 @@ index 2db5a5c74..4e75b2a56 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 25aae6af0..73cd560aa 100644
+index 7d7cdc2..7e2cacd 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -384,6 +384,9 @@ static char *current_logfile;
diff --git a/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
similarity index 93%
rename from debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
rename to debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
index f107e78..2e359bf 100644
--- a/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
@@ -21,27 +21,25 @@ the blocking and corner cases.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
- agent/call-scd.c | 4 +++-
+ agent/call-scd.c | 2 ++
agent/gpg-agent.c | 31 ++++++++++++++++++++++++++++---
- 2 files changed, 31 insertions(+), 4 deletions(-)
+ 2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/agent/call-scd.c b/agent/call-scd.c
-index 15a2ba529..0bf603084 100644
+index c86eb74..7dcd982 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
-@@ -407,7 +407,9 @@ start_scd (ctrl_t ctrl)
+@@ -415,6 +415,8 @@ start_scd (ctrl_t ctrl)
primary_scd_ctx = ctx;
primary_scd_ctx_reusable = 0;
--
+ /* notify the main loop that something has changed */
+ interrupt_main_thread_loop ();
-+
+
leave:
xfree (abs_homedir);
- if (err)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 73cd560aa..b33de7d39 100644
+index 7e2cacd..621cc89 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2279,6 +2279,26 @@ create_directories (void)
diff --git a/debian/patches/gpg-agent-idling/0004-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
similarity index 96%
rename from debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
rename to debian/patches/gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 557deff..2316245 100644
--- a/debian/patches/gpg-agent-idling/0004-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,7 +12,7 @@ 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 b33de7d39..56c28a679 100644
+index 621cc89..0f3884c 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2907,6 +2907,8 @@ handle_connections (gnupg_fd_t listen_fd,
diff --git a/debian/patches/series b/debian/patches/series
index a43241d..0ebaa56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
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
-dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
-dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.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
+debian-packaging/0002-avoid-regenerating-defsincdate-use-shipped-file.patch
+block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+dirmngr-idling/0005-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+dimrngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+dimrngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
+gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
+gpg-agent-idling/0009-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
+gpg-agent-idling/0011-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