[Pkg-gnupg-commit] [gnupg2] 48/49: refresh remaining patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Nov 8 19:31:06 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 81526ba2cc9e7e9e3175225fac330f579be83a8a
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Nov 8 20:09:14 2017 +0100
refresh remaining patches
---
.../Avoid-simple-memory-dumps-via-ptrace.patch | 8 ++++----
...-Avoid-automatically-checking-upstream-swdb.patch | 4 ++--
.../dirmngr-Avoid-need-for-hkp-housekeeping.patch | 2 +-
.../dirmngr-Drop-useless-housekeeping.patch | 2 +-
...mpile-time-configuration-of-s2k-calibration.patch | 8 ++++----
...t-a-secret-key-by-checking-availability-und.patch | 8 ++++----
.../gpg-default-to-3072-bit-RSA-keys.patch | 8 ++++----
.../patches/from-master/gpg-default-to-AES-256.patch | 2 +-
.../from-master/gpgsm-default-to-3072-bit-keys.patch | 2 +-
...ow-threads-to-interrupt-main-select-loop-wi.patch | 16 ++++++++--------
...id-scheduled-checks-on-socket-when-inotify-.patch | 4 ++--
.../agent-Avoid-tight-timer-tick-when-possible.patch | 10 +++++-----
.../agent-Create-framework-of-scheduled-timers.patch | 20 ++++++++++----------
...lt-to-SHA-512-for-all-signature-types-on-RS.patch | 6 +++---
...r-SHA-512-and-SHA-384-in-default-preference.patch | 4 ++--
15 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch
index a033ef2..f92c999 100644
--- a/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-secret-daemons/Avoid-simple-memory-dumps-via-ptrace.patch
@@ -22,7 +22,7 @@ Upstream bug: https://dev.gnupg.org/T1211
3 files changed, 18 insertions(+)
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 030d1da..d91d687 100644
+index 2e19d19..c893442 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -35,7 +35,7 @@ index 030d1da..d91d687 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -987,6 +990,11 @@ main (int argc, char **argv )
+@@ -996,6 +999,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -48,10 +48,10 @@ index 030d1da..d91d687 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 fbd5c18..e5ade60 100644
+index dc1fc1a..b227def 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1361,6 +1361,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1355,6 +1355,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/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch b/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index ae0f739..7a8cfae 100644
--- a/debian/patches/dirmngr-idling/dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/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 67d6cbd..cde6071 100644
+index d11b018..318c257 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1912,7 +1912,6 @@ static void *
@@ -46,7 +46,7 @@ index 67d6cbd..cde6071 100644
log_info ("ready with housekeeping\n");
sentinel--;
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
-index eef78a8..8030fd0 100644
+index 9654a0e..ee9fa46 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -285,9 +285,10 @@ connect all addresses listed for a server.
diff --git a/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch b/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch
index b699d7c..b816893 100644
--- a/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/dirmngr-Avoid-need-for-hkp-housekeeping.patch
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
3 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index 0d133c6..67d6cbd 100644
+index 5317c21..d11b018 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1912,12 +1912,10 @@ static void *
diff --git a/debian/patches/dirmngr-idling/dirmngr-Drop-useless-housekeeping.patch b/debian/patches/dirmngr-idling/dirmngr-Drop-useless-housekeeping.patch
index 1f4bda5..5c1ccef 100644
--- a/debian/patches/dirmngr-idling/dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/dirmngr-Drop-useless-housekeeping.patch
@@ -19,7 +19,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 6 insertions(+), 121 deletions(-)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
-index cde6071..c4b3508 100644
+index 318c257..b8d5d6f 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -334,14 +334,6 @@ static int network_activity_seen;
diff --git a/debian/patches/from-master/agent-compile-time-configuration-of-s2k-calibration.patch b/debian/patches/from-master/agent-compile-time-configuration-of-s2k-calibration.patch
index 0bf4261..86d249d 100644
--- a/debian/patches/from-master/agent-compile-time-configuration-of-s2k-calibration.patch
+++ b/debian/patches/from-master/agent-compile-time-configuration-of-s2k-calibration.patch
@@ -16,7 +16,7 @@ GnuPG-bug-id: 3399
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/agent/protect.c b/agent/protect.c
-index c257861..9b262a9 100644
+index 3073fc4..fe44f18 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -159,7 +159,7 @@ calibrate_s2k_count_one (unsigned long count)
@@ -43,10 +43,10 @@ index c257861..9b262a9 100644
count *= 1024;
if (count < 65536)
diff --git a/configure.ac b/configure.ac
-index e5ade60..5a56950 100644
+index b227def..83717eb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -122,7 +122,6 @@ use_tls_library=no
+@@ -116,7 +116,6 @@ use_tls_library=no
large_secmem=no
show_tor_support=no
@@ -54,7 +54,7 @@ index e5ade60..5a56950 100644
GNUPG_BUILD_PROGRAM(gpg, yes)
GNUPG_BUILD_PROGRAM(gpgsm, yes)
# The agent is a required part and can't be disabled anymore.
-@@ -250,6 +249,15 @@ fi
+@@ -244,6 +243,15 @@ fi
AC_DEFINE_UNQUOTED(SECMEM_BUFFER_SIZE,$SECMEM_BUFFER_SIZE,
[Size of secure memory buffer])
diff --git a/debian/patches/from-master/g10-Select-a-secret-key-by-checking-availability-und.patch b/debian/patches/from-master/g10-Select-a-secret-key-by-checking-availability-und.patch
index 01ce79d..626af07 100644
--- a/debian/patches/from-master/g10-Select-a-secret-key-by-checking-availability-und.patch
+++ b/debian/patches/from-master/g10-Select-a-secret-key-by-checking-availability-und.patch
@@ -16,7 +16,7 @@ Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/g10/getkey.c b/g10/getkey.c
-index 852c532..486330a 100644
+index c58e8ff..7061f51 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -144,7 +144,7 @@ static int lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
@@ -37,7 +37,7 @@ index 852c532..486330a 100644
print_status_key_considered (keyblock, infoflags);
if (found_key)
pk_from_block (pk, keyblock, found_key);
-@@ -3428,7 +3428,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
+@@ -3485,7 +3485,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
*/
static kbnode_t
finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
@@ -46,7 +46,7 @@ index 852c532..486330a 100644
{
kbnode_t k;
-@@ -3570,6 +3570,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
+@@ -3627,6 +3627,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
continue;
}
@@ -60,7 +60,7 @@ index 852c532..486330a 100644
if (DBG_LOOKUP)
log_debug ("\tsubkey might be fine\n");
/* In case a key has a timestamp of 0 set, we make sure
-@@ -3757,7 +3764,7 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
+@@ -3814,7 +3821,7 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
* merge_selfsigs. */
merge_selfsigs (ctrl, keyblock);
found_key = finish_lookup (keyblock, ctx->req_usage, ctx->exact,
diff --git a/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch b/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch
index 9983ff7..2b630c4 100644
--- a/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch
+++ b/debian/patches/from-master/gpg-default-to-3072-bit-RSA-keys.patch
@@ -27,7 +27,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/agent/command.c b/agent/command.c
-index f2a6683..fd39c68 100644
+index 0916f88..19524c9 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -874,7 +874,7 @@ static const char hlp_genkey[] =
@@ -58,7 +58,7 @@ index 029dbf0..55dfee6 100644
Take the hash of the string "key-submission", which is
diff --git a/g10/keygen.c b/g10/keygen.c
-index 2b17a1e..e959ee9 100644
+index 38686b2..e63fbaa 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -46,11 +46,10 @@
@@ -75,7 +75,7 @@ index 2b17a1e..e959ee9 100644
#define FUTURE_STD_KEY_PARAM "ed25519/cert,sign+cv25519/encr"
/* When generating keys using the streamlined key generation dialog,
-@@ -1623,7 +1622,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
+@@ -1624,7 +1623,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
if (nbits < 1024)
{
@@ -84,7 +84,7 @@ index 2b17a1e..e959ee9 100644
log_info (_("keysize invalid; using %u bits\n"), nbits );
}
else if (nbits > maxsize)
-@@ -2092,7 +2091,7 @@ get_keysize_range (int algo, unsigned int *min, unsigned int *max)
+@@ -2093,7 +2092,7 @@ get_keysize_range (int algo, unsigned int *min, unsigned int *max)
default:
*min = opt.compliance == CO_DE_VS ? 2048: 1024;
*max = 4096;
diff --git a/debian/patches/from-master/gpg-default-to-AES-256.patch b/debian/patches/from-master/gpg-default-to-AES-256.patch
index c86f92e..1032a0e 100644
--- a/debian/patches/from-master/gpg-default-to-AES-256.patch
+++ b/debian/patches/from-master/gpg-default-to-AES-256.patch
@@ -19,7 +19,7 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/g10/main.h b/g10/main.h
-index 87417ee..4850360 100644
+index 6c15a2a..4a8f8c3 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -31,7 +31,9 @@
diff --git a/debian/patches/from-master/gpgsm-default-to-3072-bit-keys.patch b/debian/patches/from-master/gpgsm-default-to-3072-bit-keys.patch
index bdba664..e5c0cbe 100644
--- a/debian/patches/from-master/gpgsm-default-to-3072-bit-keys.patch
+++ b/debian/patches/from-master/gpgsm-default-to-3072-bit-keys.patch
@@ -116,7 +116,7 @@ index 4431870..1d610c1 100644
nbits = get_parameter_uint (para, pKEYLENGTH);
if ((nbits < 1024 || nbits > 4096) && !cardkeyid)
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
-index 10eff0a..fa37f63 100644
+index 0feda90..9376b24 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1785,7 +1785,7 @@ main ( int argc, char **argv)
diff --git a/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch b/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 7acd242..111e0de 100644
--- a/debian/patches/gpg-agent-idling/agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+++ b/debian/patches/gpg-agent-idling/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 f5df75e..b1d23f4 100644
+index c2d8579..ba4906f 100644
--- a/agent/agent.h
+++ b/agent/agent.h
-@@ -353,6 +353,7 @@ void *get_agent_scd_notify_event (void);
+@@ -361,6 +361,7 @@ void *get_agent_scd_notify_event (void);
#endif
void agent_sighup_action (void);
int map_pk_openpgp_to_gcry (int openpgp_algo);
@@ -33,10 +33,10 @@ index f5df75e..b1d23f4 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 4b93f12..aade60a 100644
+index bae28af..2c50865 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -401,6 +401,9 @@ static int have_homedir_inotify;
+@@ -405,6 +405,9 @@ static int have_homedir_inotify;
* works reliable. */
static int reliable_homedir_inotify;
@@ -46,7 +46,7 @@ index 4b93f12..aade60a 100644
/* Number of active connections. */
static int active_connections;
-@@ -2084,7 +2087,7 @@ get_agent_scd_notify_event (void)
+@@ -2093,7 +2096,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index 4b93f12..aade60a 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2426,6 +2429,10 @@ handle_signal (int signo)
+@@ -2435,6 +2438,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index 4b93f12..aade60a 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2764,6 +2771,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2773,6 +2780,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index 4b93f12..aade60a 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2833,8 +2847,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2842,8 +2856,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/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch b/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 47d7e9f..c5d95e2 100644
--- a/debian/patches/gpg-agent-idling/agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+++ b/debian/patches/gpg-agent-idling/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 87aa616..0ae7ee0 100644
+index 2814529..b926fd0 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -3000,6 +3000,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3009,6 +3009,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/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch b/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch
index 7cad9fb..1e1c618 100644
--- a/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/agent-Avoid-tight-timer-tick-when-possible.patch
@@ -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 aade60a..87aa616 100644
+index 2c50865..2814529 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2336,6 +2336,26 @@ create_directories (void)
+@@ -2345,6 +2345,26 @@ create_directories (void)
}
@@ -69,7 +69,7 @@ index aade60a..87aa616 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2686,7 +2706,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2695,7 +2715,8 @@ do_start_connection_thread (ctrl_t ctrl)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -79,7 +79,7 @@ index aade60a..87aa616 100644
return NULL;
}
-@@ -2766,7 +2787,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2775,7 +2796,8 @@ start_connection_thread_ssh (void *arg)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -89,7 +89,7 @@ index aade60a..87aa616 100644
return NULL;
}
-@@ -2976,6 +2998,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2985,6 +3007,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/agent-Create-framework-of-scheduled-timers.patch b/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch
index 05d5ba7..d838f95 100644
--- a/debian/patches/gpg-agent-idling/agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/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 d91d687..4b93f12 100644
+index c893442..bae28af 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2339,12 +2339,8 @@ create_directories (void)
+@@ -2348,12 +2348,8 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -47,7 +47,7 @@ index d91d687..4b93f12 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2364,15 +2360,6 @@ handle_tick (void)
+@@ -2373,15 +2369,6 @@ handle_tick (void)
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index d91d687..4b93f12 100644
/* Check whether the homedir is still available. */
if (!shutdown_pending
&& (!have_homedir_inotify || !reliable_homedir_inotify)
-@@ -2777,6 +2764,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2786,6 +2773,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index d91d687..4b93f12 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2794,9 +2790,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2803,9 +2799,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index d91d687..4b93f12 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2813,6 +2811,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2822,6 +2820,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index d91d687..4b93f12 100644
ret = npth_attr_init(&tattr);
-@@ -2920,9 +2926,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2929,9 +2935,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 d91d687..4b93f12 100644
for (;;)
{
/* Shutdown test. */
-@@ -2957,18 +2960,46 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2966,18 +2969,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 d91d687..4b93f12 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2978,7 +3009,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2987,7 +3018,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -181,7 +181,7 @@ index d91d687..4b93f12 100644
events, &events_set);
saved_errno = errno;
-@@ -3001,7 +3032,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3010,7 +3041,6 @@ handle_connections (gnupg_fd_t listen_fd,
if (!shutdown_pending)
{
diff --git a/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch b/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
index e2135d1..74650ff 100644
--- a/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
+++ b/debian/patches/update-defaults/gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch
@@ -20,10 +20,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 5a56950..e0f1610 100644
+index 83717eb..e71379f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -320,7 +320,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
+@@ -314,7 +314,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
GNUPG_GPG_DISABLE_ALGO([sha224],[SHA-224 hash])
# SHA256 is a MUST algorithm for GnuPG.
GNUPG_GPG_DISABLE_ALGO([sha384],[SHA-384 hash])
@@ -33,7 +33,7 @@ index 5a56950..e0f1610 100644
# Allow disabling of zip support.
diff --git a/g10/main.h b/g10/main.h
-index 4850360..8296323 100644
+index 4a8f8c3..71f797d 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -41,7 +41,7 @@
diff --git a/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch b/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
index c1bf9ea..49193bf 100644
--- a/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
+++ b/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-default-preference.patch
@@ -21,10 +21,10 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/g10/keygen.c b/g10/keygen.c
-index e959ee9..82e35a4 100644
+index e63fbaa..3f47a1e 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
-@@ -383,16 +383,16 @@ keygen_set_std_prefs (const char *string,int personal)
+@@ -384,16 +384,16 @@ keygen_set_std_prefs (const char *string,int personal)
strcat(dummy_string,"S2 "); /* 3DES */
/* The default hash algo order is:
--
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