[Pkg-gnupg-commit] [gnupg2] 114/116: refresh debian/patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Jan 24 04:41:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit 223c796e0fd2fcd74f0914f30366a5e6dbc6b083
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Jan 23 23:04:03 2017 -0500
refresh debian/patches
---
...0002-Avoid-simple-memory-dumps-via-ptrace.patch | 8 ++--
.../debian-packaging/0001-avoid-beta-warning.patch | 10 ++--
...-Avoid-potential-race-condition-when-some.patch | 2 +-
...2-dimrngr-Avoid-need-for-hkp-housekeeping.patch | 53 ++++++++++------------
...void-automatically-checking-upstream-swdb.patch | 6 +--
.../0005-dirmngr-Drop-useless-housekeeping.patch | 16 +++----
...gent-Create-framework-of-scheduled-timers.patch | 20 ++++----
...-threads-to-interrupt-main-select-loop-wi.patch | 14 +++---
...gent-Avoid-tight-timer-tick-when-possible.patch | 14 +++---
...-scheduled-checks-on-socket-when-inotify-.patch | 4 +-
10 files changed, 72 insertions(+), 75 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 50d46f3..96a8e0d 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 f4ed6c5c4..f5ecea544 100644
+index c0208cc88..31bf3370a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index f4ed6c5c4..f5ecea544 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -947,6 +950,11 @@ main (int argc, char **argv )
+@@ -949,6 +952,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -45,9 +45,9 @@ index f4ed6c5c4..f5ecea544 100644
+
/* Before we do anything else we save the list of currently open
file descriptors and the signal mask. This info is required to
- do the exec call properly. */
+ do the exec call properly. We don't need it on Windows. */
diff --git a/configure.ac b/configure.ac
-index 663061031..932c741ef 100644
+index f929cb60f..f2b6a70d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1335,6 +1335,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap 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 f541c1a..ea08ce8 100644
--- a/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
+++ b/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
@@ -19,10 +19,10 @@ See discussion at:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 92c6df807..6b631a241 100755
+index e5ba5bf05..d7bab0383 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
+@@ -229,7 +229,7 @@ if [ "$myhost" = "find-version" ]; then
esac
beta=no
@@ -30,9 +30,9 @@ index 92c6df807..6b631a241 100755
+ if false; then
ingit=yes
tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
- if [ -n "$tmp" ]; then
-@@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
- rvd=$((0x$(echo ${rev} | head -c 4)))
+ tmp=$(echo "$tmp" | sed s/^"$package"//)
+@@ -245,8 +245,8 @@ if [ "$myhost" = "find-version" ]; then
+ rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
else
ingit=no
- beta=yes
diff --git a/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch b/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index 2020da7..f1bcde3 100644
--- a/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+++ b/debian/patches/dirmngr-idling/0001-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 a6c22f8cd..2d1240bb3 100644
+index 45965cecc..57e7529f3 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)
diff --git a/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
index 75f4b90..c23485c 100644
--- a/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
@@ -21,15 +21,15 @@ HOUSEKEEPING_INTERVAL seconds.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
dirmngr/dirmngr.c | 3 --
- dirmngr/dirmngr.h | 4 ---
+ dirmngr/dirmngr.h | 1 -
dirmngr/ks-engine-hkp.c | 73 ++++++++++++++++++++++++-------------------------
- 3 files changed, 36 insertions(+), 44 deletions(-)
+ 3 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 5ee589e93..130f74bc7 100644
+index 061cfc300..a8be56fa4 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1773,12 +1773,10 @@ static void *
+@@ -1771,12 +1771,10 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -42,7 +42,7 @@ index 5ee589e93..130f74bc7 100644
if (sentinel)
{
log_info ("housekeeping is already going on\n");
-@@ -1791,7 +1789,6 @@ housekeeping_thread (void *arg)
+@@ -1789,7 +1787,6 @@ housekeeping_thread (void *arg)
memset (&ctrlbuf, 0, sizeof ctrlbuf);
dirmngr_init_default_ctrl (&ctrlbuf);
@@ -51,22 +51,19 @@ index 5ee589e93..130f74bc7 100644
{
network_activity_seen = 0;
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
-index 9a8787842..0469d55bc 100644
+index 35bc000fb..acd4c636d 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
-@@ -192,10 +192,6 @@ void dirmngr_sighup_action (void);
- const char* dirmngr_get_current_socket_name (void);
+@@ -193,7 +193,6 @@ const char* dirmngr_get_current_socket_name (void);
--/*-- Various housekeeping functions. --*/
+ /*-- Various housekeeping functions. --*/
-void ks_hkp_housekeeping (time_t curtime);
--
--
- /*-- server.c --*/
- ldap_server_t get_ldapservers_from_ctrl (ctrl_t ctrl);
- ksba_cert_t get_cert_local (ctrl_t ctrl, const char *issuer);
+ void ks_hkp_reload (void);
+
+
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 2d1240bb3..6f1c2e8e0 100644
+index 57e7529f3..2b90441e2 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)
@@ -110,7 +107,7 @@ index 2d1240bb3..6f1c2e8e0 100644
{
tblsize++;
tbl = xtryrealloc(tbl, tblsize * sizeof *tbl);
-@@ -392,6 +413,7 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect,
+@@ -395,6 +416,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;
@@ -118,7 +115,7 @@ index 2d1240bb3..6f1c2e8e0 100644
*r_host = NULL;
if (r_httpflags)
-@@ -538,6 +560,7 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect,
+@@ -531,6 +553,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
xfree (reftbl);
}
@@ -126,7 +123,7 @@ index 2d1240bb3..6f1c2e8e0 100644
hi = hosttable[idx];
if (hi->pool)
{
-@@ -554,7 +577,7 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect,
+@@ -547,7 +570,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
@@ -135,16 +132,16 @@ index 2d1240bb3..6f1c2e8e0 100644
hi->poolidx = -1;
/* Select a host if needed. */
-@@ -578,7 +601,7 @@ map_host (ctrl_t ctrl, const char *name, int force_reselect,
- assert (hi);
+@@ -599,7 +622,7 @@ map_host (ctrl_t ctrl, const char *name, const char *srvtag, int force_reselect,
+ free_dns_addrinfo (aibuf);
}
- if (hi->dead)
+ if (!host_is_alive (hi, curtime))
{
log_error ("host '%s' marked as dead\n", hi->name);
- if (r_poolname)
-@@ -683,7 +706,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+ if (r_httphost)
+@@ -704,7 +727,8 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
{
gpg_error_t err = 0;
hostinfo_t hi, hi2;
@@ -154,7 +151,7 @@ index 2d1240bb3..6f1c2e8e0 100644
if (!name || !*name || !strcmp (name, "localhost"))
return 0;
-@@ -692,13 +716,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -713,13 +737,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
if (idx == -1)
return gpg_error (GPG_ERR_NOT_FOUND);
@@ -172,7 +169,7 @@ index 2d1240bb3..6f1c2e8e0 100644
{
hi->dead = 1;
hi->died_at = 0; /* Manually set dead. */
-@@ -730,14 +756,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
+@@ -751,14 +777,15 @@ ks_hkp_mark_host (ctrl_t ctrl, const char *name, int alive)
hi2 = hosttable[n];
if (!hi2)
@@ -191,7 +188,7 @@ index 2d1240bb3..6f1c2e8e0 100644
{
hi2->dead = 1;
hi2->died_at = 0; /* Manually set dead. */
-@@ -939,34 +966,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
+@@ -974,34 +1001,6 @@ ks_hkp_resolve (ctrl_t ctrl, parsed_uri_t uri)
}
@@ -223,6 +220,6 @@ index 2d1240bb3..6f1c2e8e0 100644
-}
-
-
- /* Send an HTTP request. On success returns an estream object at
- R_FP. HOSTPORTSTR is only used for diagnostics. If HTTPHOST is
- not NULL it will be used as HTTP "Host" header. If POST_CB is not
+ /* Reload (SIGHUP) action for this module. We mark all host alive
+ * even those which have been manually shot. */
+ void
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
index 0851a62..37adacd 100644
--- 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
@@ -13,10 +13,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 13 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 130f74bc7..58a424e8c 100644
+index a8be56fa4..746f43d10 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1773,7 +1773,6 @@ static void *
+@@ -1771,7 +1771,6 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -24,7 +24,7 @@ index 130f74bc7..58a424e8c 100644
(void)arg;
-@@ -1786,18 +1785,6 @@ housekeeping_thread (void *arg)
+@@ -1784,18 +1783,6 @@ housekeeping_thread (void *arg)
if (opt.verbose > 1)
log_info ("starting housekeeping\n");
diff --git a/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
index affb982..69bdc9d 100644
--- a/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
@@ -19,7 +19,7 @@ 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 58a424e8c..0b8bb02e6 100644
+index 746f43d10..8d9de9e5a 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -304,13 +304,6 @@ static int active_connections;
@@ -36,7 +36,7 @@ index 58a424e8c..0b8bb02e6 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.). */
-@@ -1768,83 +1761,6 @@ handle_signal (int signo)
+@@ -1766,83 +1759,6 @@ handle_signal (int signo)
#endif /*!HAVE_W32_SYSTEM*/
@@ -120,7 +120,7 @@ index 58a424e8c..0b8bb02e6 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
-@@ -1945,9 +1861,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1943,9 +1859,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 58a424e8c..0b8bb02e6 100644
int saved_errno;
int my_inotify_fd = -1;
-@@ -1987,9 +1900,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1985,9 +1898,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/
@@ -141,7 +141,7 @@ index 58a424e8c..0b8bb02e6 100644
FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd);
-@@ -2000,9 +1911,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -1998,9 +1909,6 @@ handle_connections (assuan_fd_t listen_fd)
nfd = my_inotify_fd;
}
@@ -151,7 +151,7 @@ index 58a424e8c..0b8bb02e6 100644
/* Main loop. */
for (;;)
{
-@@ -2013,7 +1921,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2011,7 +1919,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 58a424e8c..0b8bb02e6 100644
*
* Note that we do not close the listening socket because a
* client trying to connect to that socket would instead
-@@ -2033,24 +1941,14 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2031,24 +1939,14 @@ handle_connections (assuan_fd_t listen_fd)
/* Take a copy of the fdset. */
read_fdset = fdset;
@@ -187,7 +187,7 @@ index 58a424e8c..0b8bb02e6 100644
saved_errno = errno;
#endif
-@@ -2064,8 +1962,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2062,8 +1960,7 @@ handle_connections (assuan_fd_t listen_fd)
if (ret <= 0)
{
diff --git a/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
index b758117..05817dd 100644
--- a/debian/patches/gpg-agent-idling/0001-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 f5ecea544..82c8ae062 100644
+index 31bf3370a..25aae6af0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2270,11 +2270,6 @@ create_directories (void)
+@@ -2282,11 +2282,6 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -46,7 +46,7 @@ index f5ecea544..82c8ae062 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2293,16 +2288,6 @@ handle_tick (void)
+@@ -2305,16 +2300,6 @@ handle_tick (void)
}
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index f5ecea544..82c8ae062 100644
}
-@@ -2699,6 +2684,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2711,6 +2696,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index f5ecea544..82c8ae062 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2716,9 +2710,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2728,9 +2722,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index f5ecea544..82c8ae062 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2734,6 +2730,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2746,6 +2742,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index f5ecea544..82c8ae062 100644
ret = npth_attr_init(&tattr);
-@@ -2823,9 +2827,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2835,9 +2839,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 f5ecea544..82c8ae062 100644
for (;;)
{
/* Shutdown test. */
-@@ -2854,18 +2855,47 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2866,18 +2867,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 f5ecea544..82c8ae062 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2875,7 +2905,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2887,7 +2917,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -182,7 +182,7 @@ index f5ecea544..82c8ae062 100644
events, &events_set);
saved_errno = errno;
-@@ -2898,7 +2928,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2910,7 +2940,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/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index be89c24..317cea5 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
@@ -21,7 +21,7 @@ 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 89dc46d05..147d242ec 100644
+index 2db5a5c74..4e75b2a56 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -345,6 +345,7 @@ void *get_agent_scd_notify_event (void);
@@ -33,10 +33,10 @@ 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..f7b6e72c9 100644
+index 25aae6af0..73cd560aa 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -382,6 +382,9 @@ static char *current_logfile;
+@@ -384,6 +384,9 @@ static char *current_logfile;
watched. */
static pid_t parent_pid = (pid_t)(-1);
@@ -46,7 +46,7 @@ index 82c8ae062..f7b6e72c9 100644
/* Number of active connections. */
static int active_connections;
-@@ -2020,7 +2023,7 @@ get_agent_scd_notify_event (void)
+@@ -2032,7 +2035,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index 82c8ae062..f7b6e72c9 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2346,6 +2349,10 @@ handle_signal (int signo)
+@@ -2358,6 +2361,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index 82c8ae062..f7b6e72c9 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2684,6 +2691,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2696,6 +2703,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index 82c8ae062..f7b6e72c9 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2752,8 +2766,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2764,8 +2778,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/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 51ca0cc..f107e78 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
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/agent/call-scd.c b/agent/call-scd.c
-index ba59c1825..1ac0f6ba5 100644
+index 15a2ba529..0bf603084 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -407,7 +407,9 @@ start_scd (ctrl_t ctrl)
@@ -41,10 +41,10 @@ index ba59c1825..1ac0f6ba5 100644
xfree (abs_homedir);
if (err)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index f7b6e72c9..de9c7c9ee 100644
+index 73cd560aa..b33de7d39 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2267,6 +2267,26 @@ create_directories (void)
+@@ -2279,6 +2279,26 @@ create_directories (void)
}
@@ -71,7 +71,7 @@ index f7b6e72c9..de9c7c9ee 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2325,7 +2345,7 @@ agent_sigusr2_action (void)
+@@ -2337,7 +2357,7 @@ agent_sigusr2_action (void)
#ifndef HAVE_W32_SYSTEM
/* The signal handler for this program. It is expected to be run in
@@ -80,7 +80,7 @@ index f7b6e72c9..de9c7c9ee 100644
static void
handle_signal (int signo)
{
-@@ -2606,7 +2626,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2618,7 +2638,8 @@ do_start_connection_thread (ctrl_t ctrl)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -90,7 +90,7 @@ index f7b6e72c9..de9c7c9ee 100644
return NULL;
}
-@@ -2686,7 +2707,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2698,7 +2719,8 @@ start_connection_thread_ssh (void *arg)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -100,7 +100,7 @@ index f7b6e72c9..de9c7c9ee 100644
return NULL;
}
-@@ -2871,6 +2893,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2883,6 +2905,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 2d9a168..557deff 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 de9c7c9ee..d8c574fe6 100644
+index b33de7d39..56c28a679 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2895,6 +2895,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2907,6 +2907,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