[Pkg-gnupg-commit] [gnupg2] 130/132: more patch cleanup
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed May 17 03:07:55 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 e219bf06fcd4482136ad36111ba7767c2e9e5125
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 16 22:40:19 2017 -0400
more patch cleanup
---
.../0003-Avoid-simple-memory-dumps-via-ptrace.patch | 4 ++--
...gr-hkp-Avoid-potential-race-condition-when-some.patch | 2 +-
.../0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch | 4 ++--
...mngr-Avoid-automatically-checking-upstream-swdb.patch | 4 ++--
.../0007-dirmngr-Drop-useless-housekeeping.patch | 16 ++++++++--------
...0008-agent-Create-framework-of-scheduled-timers.patch | 2 +-
...-Allow-threads-to-interrupt-main-select-loop-wi.patch | 2 +-
...0010-agent-Avoid-tight-timer-tick-when-possible.patch | 4 ++--
...-Avoid-scheduled-checks-on-socket-when-inotify-.patch | 2 +-
...kip-signing-keys-where-no-secret-key-is-availab.patch | 4 ++--
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index b0a8242..7e019fc 100644
--- a/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0003-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -21,7 +21,7 @@ Upstream bug: https://bugs.gnupg.org/gnupg/issue1211
2 files changed, 9 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index e23f438..6895358 100644
+index c764be8..43ca673 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -47,7 +47,7 @@ index e23f438..6895358 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 df7a059..33cad0e 100644
+index 9395fb8..4e4272e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1356,6 +1356,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
diff --git a/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch b/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index 110092b..a8cac15 100644
--- a/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index 1592fab..f7a8756 100644
+index ddb8549..2937b00 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -206,25 +206,24 @@ host_in_pool_p (int *pool, int tblidx)
diff --git a/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
index a49e9d7..47f7686 100644
--- a/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Avoid-need-for-hkp-housekeeping.patch
@@ -26,7 +26,7 @@ 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 07b3b91..e3c1c3e 100644
+index 8393e0b..8ab4a89 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1861,12 +1861,10 @@ static void *
@@ -63,7 +63,7 @@ index e10de09..e9be4fb 100644
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
-index f7a8756..3b78d1a 100644
+index 2937b00..9aca2b7 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -200,6 +200,25 @@ host_in_pool_p (int *pool, int tblidx)
diff --git a/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index 36d5895..78f3d36 100644
--- a/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/0006-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
@@ -15,7 +15,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index e3c1c3e..febb56d 100644
+index 8ab4a89..fee1b61 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1861,7 +1861,6 @@ static void *
@@ -46,7 +46,7 @@ index e3c1c3e..febb56d 100644
log_info ("ready with housekeeping\n");
sentinel--;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index 027bb94..403ecae 100644
+index 22a7943..23442b4 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -266,9 +266,10 @@ seconds.
diff --git a/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
index 713e503..de04a75 100644
--- a/debian/patches/dirmngr-idling/0007-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0007-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 febb56d..3972977 100644
+index fee1b61..e30c16c 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -327,13 +327,6 @@ static int network_activity_seen;
@@ -120,8 +120,8 @@ index febb56d..3972977 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
-@@ -2033,9 +1949,6 @@ handle_connections (assuan_fd_t listen_fd)
- gnupg_fd_t fd;
+@@ -2032,9 +1948,6 @@ handle_connections (assuan_fd_t listen_fd)
+ socklen_t plen = sizeof( paddr );
int nfd, ret;
fd_set fdset, read_fdset;
- struct timespec abstime;
@@ -130,7 +130,7 @@ index febb56d..3972977 100644
int saved_errno;
int my_inotify_fd = -1;
-@@ -2075,9 +1988,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2074,9 +1987,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/
@@ -141,7 +141,7 @@ index febb56d..3972977 100644
FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd);
-@@ -2088,9 +1999,6 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2087,9 +1998,6 @@ handle_connections (assuan_fd_t listen_fd)
nfd = my_inotify_fd;
}
@@ -151,7 +151,7 @@ index febb56d..3972977 100644
/* Main loop. */
for (;;)
{
-@@ -2101,7 +2009,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2100,7 +2008,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 febb56d..3972977 100644
*
* Note that we do not close the listening socket because a
* client trying to connect to that socket would instead
-@@ -2121,24 +2029,14 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2120,24 +2028,14 @@ handle_connections (assuan_fd_t listen_fd)
/* Take a copy of the fdset. */
read_fdset = fdset;
@@ -187,7 +187,7 @@ index febb56d..3972977 100644
saved_errno = errno;
#endif
-@@ -2152,8 +2050,7 @@ handle_connections (assuan_fd_t listen_fd)
+@@ -2151,8 +2049,7 @@ handle_connections (assuan_fd_t listen_fd)
if (ret <= 0)
{
diff --git a/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/0008-agent-Create-framework-of-scheduled-timers.patch
index 1af78fe..c3b0a5c 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,7 +31,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 57 insertions(+), 29 deletions(-)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 6895358..332285f 100644
+index 43ca673..cb5a391 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2291,11 +2291,6 @@ create_directories (void)
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 1bf9311..7fe17c0 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,7 +33,7 @@ index 01e675b..fadc8e8 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 332285f..2e97188 100644
+index cb5a391..8306917 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -386,6 +386,9 @@ static char *current_logfile;
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 ed3a39f..af18cb0 100644
--- a/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/agent/call-scd.c b/agent/call-scd.c
-index 09ec4fd..c27fe87 100644
+index cf61a35..d8fe35a 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -415,6 +415,8 @@ start_scd (ctrl_t ctrl)
@@ -39,7 +39,7 @@ index 09ec4fd..c27fe87 100644
leave:
xfree (abs_homedir);
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 2e97188..407cc09 100644
+index 8306917..71606e9 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2288,6 +2288,26 @@ create_directories (void)
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 ae632ae..ad92ab8 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,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 407cc09..c16d9a3 100644
+index 71606e9..098a335 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2916,6 +2916,8 @@ handle_connections (gnupg_fd_t listen_fd,
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 1b455fc..27c5ceb 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
@@ -32,10 +32,10 @@ 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 dab63fa..99bb98e 100644
+index d8c81c9..a81041f 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
-@@ -3548,6 +3548,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
+@@ -3549,6 +3549,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
continue;
}
--
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