[Pkg-gnupg-commit] [gnupg2] 02/07: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Aug 11 16:51:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to annotated tag debian/2.1.23-1
in repository gnupg2.
commit e5ebb0a432157c563baf42bc62bb520023ca28b8
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Aug 11 09:40:46 2017 -0400
refresh patches
---
...lain-the-server-is-older-than-xxx-warning.patch | 98 ----------------------
...save-standard-revocation-certificate-in-f.patch | 38 ---------
...ouble-fingerprint-printing-with-import-sh.patch | 27 ------
...-systemd-user-Drop-RefuseManualStart-true.patch | 44 ----------
...systemd-user-Drop-redundant-After-.socket.patch | 44 ----------
...0003-Avoid-simple-memory-dumps-via-ptrace.patch | 8 +-
...gent-Create-framework-of-scheduled-timers.patch | 20 ++---
...-threads-to-interrupt-main-select-loop-wi.patch | 12 +--
...gent-Avoid-tight-timer-tick-when-possible.patch | 23 ++---
...-scheduled-checks-on-socket-when-inotify-.patch | 4 +-
debian/patches/series | 5 --
...gning-keys-where-no-secret-key-is-availab.patch | 2 +-
12 files changed, 30 insertions(+), 295 deletions(-)
diff --git a/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch b/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch
deleted file mode 100644
index 76b31e0..0000000
--- a/debian/patches/0013-Explain-the-server-is-older-than-xxx-warning.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Mon, 31 Jul 2017 11:20:47 +0200
-Subject: Explain the "server is older than xxx warning".
-
-* g10/call-agent.c (warn_version_mismatch): Print a note on how to
-restart the servers.
-* g10/call-dirmngr.c (warn_version_mismatch): Ditto.
-* sm/call-agent.c (warn_version_mismatch): Ditto.
-* sm/call-dirmngr.c (warn_version_mismatch): Ditto.
---
-
-We should move this fucntion to common. However, the status output
-functions are different and would need to be streamlined too.
-
-GnuPG-bug-id: 3117
-Debian-bug-id: 860745
-Signed-off-by: Werner Koch <wk at gnupg.org>
-(cherry picked from commit 4ad5bc1b6d72483123963c894ee1412b2ceb99b4)
----
- g10/call-agent.c | 7 +++++++
- g10/call-dirmngr.c | 8 ++++++++
- sm/call-agent.c | 7 +++++++
- sm/call-dirmngr.c | 7 +++++++
- 4 files changed, 29 insertions(+)
-
-diff --git a/g10/call-agent.c b/g10/call-agent.c
-index 1ce6641..545b244 100644
---- a/g10/call-agent.c
-+++ b/g10/call-agent.c
-@@ -209,6 +209,13 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
- else
- {
- log_info (_("WARNING: %s\n"), warn);
-+ if (!opt.quiet)
-+ {
-+ log_info (_("Note: Outdated servers may lack important"
-+ " security fixes.\n"));
-+ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
-+ "gpgconf --kill all");
-+ }
- write_status_strings (STATUS_WARNING, "server_version_mismatch 0",
- " ", warn, NULL);
- xfree (warn);
-diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
-index 9bae59f..362731e 100644
---- a/g10/call-dirmngr.c
-+++ b/g10/call-dirmngr.c
-@@ -157,6 +157,14 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername)
- else
- {
- log_info (_("WARNING: %s\n"), warn);
-+ if (!opt.quiet)
-+ {
-+ log_info (_("Note: Outdated servers may lack important"
-+ " security fixes.\n"));
-+ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
-+ "gpgconf --kill all");
-+ }
-+
- write_status_strings (STATUS_WARNING, "server_version_mismatch 0",
- " ", warn, NULL);
- xfree (warn);
-diff --git a/sm/call-agent.c b/sm/call-agent.c
-index ba8fb12..772c9c3 100644
---- a/sm/call-agent.c
-+++ b/sm/call-agent.c
-@@ -108,6 +108,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx,
- else
- {
- log_info (_("WARNING: %s\n"), warn);
-+ if (!opt.quiet)
-+ {
-+ log_info (_("Note: Outdated servers may lack important"
-+ " security fixes.\n"));
-+ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
-+ "gpgconf --kill all");
-+ }
- gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0",
- warn, NULL);
- xfree (warn);
-diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
-index 5ee15b7..9301940 100644
---- a/sm/call-dirmngr.c
-+++ b/sm/call-dirmngr.c
-@@ -175,6 +175,13 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx,
- else
- {
- log_info (_("WARNING: %s\n"), warn);
-+ if (!opt.quiet)
-+ {
-+ log_info (_("Note: Outdated servers may lack important"
-+ " security fixes.\n"));
-+ log_info (_("Note: Use the command \"%s\" to restart them.\n"),
-+ "gpgconf --kill all");
-+ }
- gpgsm_status2 (ctrl, STATUS_WARNING, "server_version_mismatch 0",
- warn, NULL);
- xfree (warn);
diff --git a/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch b/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch
deleted file mode 100644
index 3877c5b..0000000
--- a/debian/patches/0014-g10-Always-save-standard-revocation-certificate-in-f.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
-Date: Wed, 2 Aug 2017 15:19:04 +0200
-Subject: g10: Always save standard revocation certificate in file.
-
-* g10/revoke.c (gen_standard_revocation): Set opt.outfile to NULL
-temporarily to create certificate in right place.
-
-Signed-off-by: Marcus Brinkmann <mb at g10code.com>
-GnuPG-bug-id: 3015
-(cherry picked from commit dcfb01959802b27869528dda1d9a4f5e79574bb5)
----
- g10/revoke.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/g10/revoke.c b/g10/revoke.c
-index 1dea6ae..4578700 100644
---- a/g10/revoke.c
-+++ b/g10/revoke.c
-@@ -532,6 +532,7 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
- u32 keyid[2];
- int kl;
- char *orig_codeset;
-+ char *old_outfile;
-
- dir = get_openpgp_revocdir (gnupg_homedir ());
- tmpstr = hexfingerprint (psk, NULL, 0);
-@@ -586,8 +587,11 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
-
- reason.code = 0x00; /* No particular reason. */
- reason.desc = NULL;
-+ old_outfile = opt.outfile;
-+ opt.outfile = NULL;
- rc = create_revocation (ctrl,
- fname, &reason, psk, NULL, leadin, 3, cache_nonce);
-+ opt.outfile = old_outfile;
- if (!rc && !opt.quiet)
- log_info (_("revocation certificate stored as '%s.rev'\n"), fname);
-
diff --git a/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch b/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
deleted file mode 100644
index 6c4c229..0000000
--- a/debian/patches/0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Werner Koch <wk at gnupg.org>
-Date: Fri, 4 Aug 2017 17:09:17 +0200
-Subject: gpg: Avoid double fingerprint printing with import-show.
-
-* g10/import.c (import_one) <IMPORT_SHOW>: Take care of fingerprint
-options.
-
-Signed-off-by: Werner Koch <wk at gnupg.org>
-(cherry picked from commit b54d75fb1dcfa2cebb3a2497b81ffb49acac2056)
----
- g10/import.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/g10/import.c b/g10/import.c
-index 8136625..144bec7 100644
---- a/g10/import.c
-+++ b/g10/import.c
-@@ -1774,7 +1774,8 @@ import_one (ctrl_t ctrl,
- merge_keys_done = 1;
- /* Note that we do not want to show the validity because the key
- * has not yet imported. */
-- list_keyblock_direct (ctrl, keyblock, 0, 0, 1, 1);
-+ list_keyblock_direct (ctrl, keyblock, 0, 0,
-+ opt.fingerprint || opt.with_fingerprint, 1);
- es_fflush (es_stdout);
- }
-
diff --git a/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch b/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch
deleted file mode 100644
index 5ee631a..0000000
--- a/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 7 Aug 2017 04:11:51 -0400
-Subject: systemd-user: Drop RefuseManualStart=true.
-
-* doc/examples/systemd-user/*.service: drop RefuseManualStart=true
-
---
-
-These user services can be safely started manually as long as at least
-their primary sockets are available. They'll just start with nothing
-to do, which should be fine.
-
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- doc/examples/systemd-user/dirmngr.service | 2 --
- doc/examples/systemd-user/gpg-agent.service | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/doc/examples/systemd-user/dirmngr.service b/doc/examples/systemd-user/dirmngr.service
-index ded533b..2a7c76e 100644
---- a/doc/examples/systemd-user/dirmngr.service
-+++ b/doc/examples/systemd-user/dirmngr.service
-@@ -3,8 +3,6 @@ Description=GnuPG network certificate management daemon
- Documentation=man:dirmngr(8)
- Requires=dirmngr.socket
- After=dirmngr.socket
--## This is a socket-activated service:
--RefuseManualStart=true
-
- [Service]
- ExecStart=/usr/bin/dirmngr --supervised
-diff --git a/doc/examples/systemd-user/gpg-agent.service b/doc/examples/systemd-user/gpg-agent.service
-index e88dc7f..a909f0b 100644
---- a/doc/examples/systemd-user/gpg-agent.service
-+++ b/doc/examples/systemd-user/gpg-agent.service
-@@ -3,8 +3,6 @@ Description=GnuPG cryptographic agent and passphrase cache
- Documentation=man:gpg-agent(1)
- Requires=gpg-agent.socket
- After=gpg-agent.socket
--## This is a socket-activated service:
--RefuseManualStart=true
-
- [Service]
- ExecStart=/usr/bin/gpg-agent --supervised
diff --git a/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch b/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch
deleted file mode 100644
index e229143..0000000
--- a/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Mon, 7 Aug 2017 04:14:02 -0400
-Subject: systemd-user: Drop redundant After=*.socket.
-
-* doc/examples/systemd-user/*.service: Drop redundant After=*.socket
-directive.
-
---
-
-systemd.socket(5) says:
-
- Socket units will have a Before= dependency on the service which
- they trigger added implicitly.
-
-Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
----
- doc/examples/systemd-user/dirmngr.service | 1 -
- doc/examples/systemd-user/gpg-agent.service | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/doc/examples/systemd-user/dirmngr.service b/doc/examples/systemd-user/dirmngr.service
-index 2a7c76e..3c060cd 100644
---- a/doc/examples/systemd-user/dirmngr.service
-+++ b/doc/examples/systemd-user/dirmngr.service
-@@ -2,7 +2,6 @@
- Description=GnuPG network certificate management daemon
- Documentation=man:dirmngr(8)
- Requires=dirmngr.socket
--After=dirmngr.socket
-
- [Service]
- ExecStart=/usr/bin/dirmngr --supervised
-diff --git a/doc/examples/systemd-user/gpg-agent.service b/doc/examples/systemd-user/gpg-agent.service
-index a909f0b..a050fcc 100644
---- a/doc/examples/systemd-user/gpg-agent.service
-+++ b/doc/examples/systemd-user/gpg-agent.service
-@@ -2,7 +2,6 @@
- Description=GnuPG cryptographic agent and passphrase cache
- Documentation=man:gpg-agent(1)
- Requires=gpg-agent.socket
--After=gpg-agent.socket
-
- [Service]
- ExecStart=/usr/bin/gpg-agent --supervised
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 353c82f..de602bd 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://dev.gnupg.org/T1211
2 files changed, 9 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 603f707..1dfbd84 100644
+index 030d1da..d91d687 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index 603f707..1dfbd84 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -979,6 +982,11 @@ main (int argc, char **argv )
+@@ -987,6 +990,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -47,10 +47,10 @@ index 603f707..1dfbd84 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 764a62d..c18e9ad 100644
+index 3ff5865..f211680 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1359,6 +1359,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1357,6 +1357,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/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 ac47b55..05d5ba7 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(+), 27 deletions(-)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 1dfbd84..a867d51 100644
+index d91d687..4b93f12 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2329,12 +2329,8 @@ create_directories (void)
+@@ -2339,12 +2339,8 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -47,7 +47,7 @@ index 1dfbd84..a867d51 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2354,15 +2350,6 @@ handle_tick (void)
+@@ -2364,15 +2360,6 @@ handle_tick (void)
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index 1dfbd84..a867d51 100644
/* Check whether the homedir is still available. */
if (!shutdown_pending
&& (!have_homedir_inotify || !reliable_homedir_inotify)
-@@ -2767,6 +2754,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2777,6 +2764,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index 1dfbd84..a867d51 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2784,9 +2780,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2794,9 +2790,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index 1dfbd84..a867d51 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2803,6 +2801,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2813,6 +2811,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index 1dfbd84..a867d51 100644
ret = npth_attr_init(&tattr);
-@@ -2910,9 +2916,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2920,9 +2926,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 1dfbd84..a867d51 100644
for (;;)
{
/* Shutdown test. */
-@@ -2947,18 +2950,46 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2957,18 +2960,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 1dfbd84..a867d51 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2968,7 +2999,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2978,7 +3009,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -181,7 +181,7 @@ index 1dfbd84..a867d51 100644
events, &events_set);
saved_errno = errno;
-@@ -2991,7 +3022,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3001,7 +3032,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 401c8eb..e97957f 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
@@ -33,10 +33,10 @@ index 815d9a5..2131563 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 a867d51..2052adb 100644
+index 4b93f12..aade60a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -397,6 +397,9 @@ static int have_homedir_inotify;
+@@ -401,6 +401,9 @@ static int have_homedir_inotify;
* works reliable. */
static int reliable_homedir_inotify;
@@ -46,7 +46,7 @@ index a867d51..2052adb 100644
/* Number of active connections. */
static int active_connections;
-@@ -2074,7 +2077,7 @@ get_agent_scd_notify_event (void)
+@@ -2084,7 +2087,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index a867d51..2052adb 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2416,6 +2419,10 @@ handle_signal (int signo)
+@@ -2426,6 +2429,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index a867d51..2052adb 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2754,6 +2761,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2764,6 +2771,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index a867d51..2052adb 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2823,8 +2837,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2833,8 +2847,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 284da42..7cad9fb 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
@@ -22,8 +22,8 @@ the blocking and corner cases.
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
agent/call-scd.c | 2 ++
- agent/gpg-agent.c | 31 ++++++++++++++++++++++++++++---
- 2 files changed, 30 insertions(+), 3 deletions(-)
+ agent/gpg-agent.c | 29 +++++++++++++++++++++++++++--
+ 2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/agent/call-scd.c b/agent/call-scd.c
index cf61a35..d8fe35a 100644
@@ -39,10 +39,10 @@ index cf61a35..d8fe35a 100644
leave:
xfree (abs_homedir);
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 2052adb..d90065d 100644
+index aade60a..87aa616 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2326,6 +2326,26 @@ create_directories (void)
+@@ -2336,6 +2336,26 @@ create_directories (void)
}
@@ -69,16 +69,7 @@ index 2052adb..d90065d 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2395,7 +2415,7 @@ agent_sigusr2_action (void)
-
- #ifndef HAVE_W32_SYSTEM
- /* The signal handler for this program. It is expected to be run in
-- its own trhead and not in the context of a signal handler. */
-+ its own thread and not in the context of a signal handler. */
- static void
- handle_signal (int signo)
- {
-@@ -2676,7 +2696,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2686,7 +2706,8 @@ do_start_connection_thread (ctrl_t ctrl)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -88,7 +79,7 @@ index 2052adb..d90065d 100644
return NULL;
}
-@@ -2756,7 +2777,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2766,7 +2787,8 @@ start_connection_thread_ssh (void *arg)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -98,7 +89,7 @@ index 2052adb..d90065d 100644
return NULL;
}
-@@ -2966,6 +2988,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2976,6 +2998,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 dc41f33..47d7e9f 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 d90065d..f50e739 100644
+index 87aa616..0ae7ee0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2990,6 +2990,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3000,6 +3000,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 5e8e5de..ea6811b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,8 +10,3 @@ 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
skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
-0013-Explain-the-server-is-older-than-xxx-warning.patch
-0014-g10-Always-save-standard-revocation-certificate-in-f.patch
-0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
-0016-systemd-user-Drop-RefuseManualStart-true.patch
-0017-systemd-user-Drop-redundant-After-.socket.patch
diff --git a/debian/patches/skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch b/debian/patches/skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
index de21fe4..d00e0e6 100644
--- a/debian/patches/skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
+++ b/debian/patches/skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
@@ -31,7 +31,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 7 insertions(+)
diff --git a/g10/getkey.c b/g10/getkey.c
-index 79bce61..6859b5e 100644
+index 852c532..946ca90 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -3570,6 +3570,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
--
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