[Pkg-gnupg-commit] [gnupg2] 06/16: refresh patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Tue Feb 6 04:20:13 UTC 2018
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit c37b77a67652854f62f74726af5e97f765f3b193
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Jan 3 12:38:50 2018 -0500
refresh patches
---
.../Avoid-simple-memory-dumps-via-ptrace.patch | 10 +++++-----
...-Avoid-automatically-checking-upstream-swdb.patch | 4 +++-
.../dirmngr-Avoid-need-for-hkp-housekeeping.patch | 10 +++++-----
...mpile-time-configuration-of-s2k-calibration.patch | 4 ++--
...t-a-secret-key-by-checking-availability-und.patch | 10 +++++-----
.../gpg-default-to-3072-bit-RSA-keys.patch | 12 ++++++------
.../from-master/gpgsm-default-to-3072-bit-keys.patch | 4 ++--
...stinguish-cancel-by-user-and-protocol-error.patch | 2 +-
...ow-threads-to-interrupt-main-select-loop-wi.patch | 12 ++++++------
...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 | 2 +-
...efer-SHA-512-and-SHA-384-in-personal-digest.patch | 6 ++++--
14 files changed, 57 insertions(+), 53 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 86b1941..289b220 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 0b2b982..59b046b 100644
+index a1964ec..ae525ae 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -35,7 +35,7 @@ index 0b2b982..59b046b 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
-@@ -996,6 +999,11 @@ main (int argc, char **argv )
+@@ -1006,6 +1009,11 @@ main (int argc, char **argv )
early_system_init ();
@@ -48,7 +48,7 @@ index 0b2b982..59b046b 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 fb6f0da..e7a85c5 100644
+index 382ef1d..87b0c64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1356,6 +1356,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
@@ -60,7 +60,7 @@ index fb6f0da..e7a85c5 100644
AC_CHECK_FUNCS([atexit raise getpagesize strftime nl_langinfo setlocale])
AC_CHECK_FUNCS([waitpid wait4 sigaction sigprocmask pipe getaddrinfo])
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
-index 60d539d..133a8b4 100644
+index 3ad2657..f2c521e 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -36,6 +36,9 @@
@@ -73,7 +73,7 @@ index 60d539d..133a8b4 100644
#define GNUPG_COMMON_NEED_AFLOCAL
#include "scdaemon.h"
-@@ -414,6 +417,12 @@ main (int argc, char **argv )
+@@ -420,6 +423,12 @@ main (int argc, char **argv )
npth_t pipecon_handler;
early_system_init ();
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 7729b15..ffe3c51 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
@@ -27,9 +27,11 @@ index 8be069f..b3766fb 100644
workqueue_run_global_tasks (&ctrlbuf, 1);
}
else
+diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
+index 800955c..4f69760 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
-@@ -289,9 +289,10 @@
+@@ -289,9 +289,10 @@ Set the size of the queue for pending connections. The default is 64.
@item --allow-version-check
@opindex allow-version-check
Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
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 b816893..f405720 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,10 +26,10 @@ 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 5317c21..d11b018 100644
+index 17adae2..8be069f 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
-@@ -1912,12 +1912,10 @@ static void *
+@@ -1926,12 +1926,10 @@ static void *
housekeeping_thread (void *arg)
{
static int sentinel;
@@ -42,7 +42,7 @@ index 5317c21..d11b018 100644
if (sentinel)
{
log_info ("housekeeping is already going on\n");
-@@ -1930,7 +1928,6 @@ housekeeping_thread (void *arg)
+@@ -1944,7 +1942,6 @@ housekeeping_thread (void *arg)
memset (&ctrlbuf, 0, sizeof ctrlbuf);
dirmngr_init_default_ctrl (&ctrlbuf);
@@ -51,10 +51,10 @@ index 5317c21..d11b018 100644
{
network_activity_seen = 0;
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
-index 1f660de..bd0b06c 100644
+index 5189f93..c27f837 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
-@@ -213,7 +213,6 @@ const char* dirmngr_get_current_socket_name (void);
+@@ -215,7 +215,6 @@ const char* dirmngr_get_current_socket_name (void);
int dirmngr_use_tor (void);
/*-- Various housekeeping functions. --*/
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 a4dcb9f..f498b5d 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 9bb2da6..90690d9 100644
+index 7b5abf2..16ae715 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -163,7 +163,7 @@ calibrate_s2k_count_one (unsigned long count)
@@ -43,7 +43,7 @@ index 9bb2da6..90690d9 100644
count *= 1024;
if (count < 65536)
diff --git a/configure.ac b/configure.ac
-index e7a85c5..0accf93 100644
+index 87b0c64..6541aaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ use_tls_library=no
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 2724a7c..5994cbc 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 f73e443..0a741cb 100644
+index e31e023..dabd052 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,
@@ -28,7 +28,7 @@ index f73e443..0a741cb 100644
static void print_status_key_considered (kbnode_t keyblock, unsigned int flags);
-@@ -1735,7 +1735,7 @@ get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname)
+@@ -1743,7 +1743,7 @@ get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname)
/* Warning: node flag bits 0 and 1 should be preserved by
* merge_selfsigs. FIXME: Check whether this still holds. */
merge_selfsigs (ctrl, keyblock);
@@ -37,7 +37,7 @@ index f73e443..0a741cb 100644
print_status_key_considered (keyblock, infoflags);
if (found_key)
pk_from_block (pk, keyblock, found_key);
-@@ -3486,7 +3486,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
+@@ -3494,7 +3494,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 f73e443..0a741cb 100644
{
kbnode_t k;
-@@ -3628,6 +3628,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
+@@ -3636,6 +3636,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
continue;
}
@@ -60,7 +60,7 @@ index f73e443..0a741cb 100644
if (DBG_LOOKUP)
log_debug ("\tsubkey might be fine\n");
/* In case a key has a timestamp of 0 set, we make sure
-@@ -3815,7 +3822,7 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
+@@ -3823,7 +3830,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 2b630c4..4dbc041 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
@@ -40,10 +40,10 @@ index 0916f88..19524c9 100644
" S: D (public-key\n"
" S: D (rsa (n 326487324683264) (e 10001)))\n"
diff --git a/doc/wks.texi b/doc/wks.texi
-index 029dbf0..55dfee6 100644
+index 7f7d515..131a4c2 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
-@@ -303,11 +303,11 @@ the submission address:
+@@ -332,11 +332,11 @@ the submission address:
The output of the last command looks similar to this:
@example
@@ -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 38686b2..e63fbaa 100644
+index b42afa8..99df58a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -46,11 +46,10 @@
@@ -75,7 +75,7 @@ index 38686b2..e63fbaa 100644
#define FUTURE_STD_KEY_PARAM "ed25519/cert,sign+cv25519/encr"
/* When generating keys using the streamlined key generation dialog,
-@@ -1624,7 +1623,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
+@@ -1641,7 +1640,7 @@ gen_rsa (int algo, unsigned int nbits, KBNODE pub_root,
if (nbits < 1024)
{
@@ -84,7 +84,7 @@ index 38686b2..e63fbaa 100644
log_info (_("keysize invalid; using %u bits\n"), nbits );
}
else if (nbits > maxsize)
-@@ -2093,7 +2092,7 @@ get_keysize_range (int algo, unsigned int *min, unsigned int *max)
+@@ -2110,7 +2109,7 @@ get_keysize_range (int algo, unsigned int *min, unsigned int *max)
default:
*min = opt.compliance == CO_DE_VS ? 2048: 1024;
*max = 4096;
@@ -94,7 +94,7 @@ index 38686b2..e63fbaa 100644
}
diff --git a/g10/keyid.c b/g10/keyid.c
-index d733156..c519bc5 100644
+index ba35ec2..e7a97e9 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -73,7 +73,7 @@ pubkey_letter( int algo )
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 e285f4b..f7b6c7b 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,10 +116,10 @@ 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 0feda90..9376b24 100644
+index b505be1..f051974 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
-@@ -1785,7 +1785,7 @@ main ( int argc, char **argv)
+@@ -1786,7 +1786,7 @@ main ( int argc, char **argv)
/* The next one is an info only item and should match what
proc_parameters actually implements. */
es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT,
diff --git a/debian/patches/from-master/scd-Distinguish-cancel-by-user-and-protocol-error.patch b/debian/patches/from-master/scd-Distinguish-cancel-by-user-and-protocol-error.patch
index 64dce38..76e235d 100644
--- a/debian/patches/from-master/scd-Distinguish-cancel-by-user-and-protocol-error.patch
+++ b/debian/patches/from-master/scd-Distinguish-cancel-by-user-and-protocol-error.patch
@@ -17,7 +17,7 @@ Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scd/apdu.c b/scd/apdu.c
-index 97624eb..1b25ceb 100644
+index c50afbd..49c222a 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -496,6 +496,7 @@ host_sw_string (long err)
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 e7ba390..2f20b3c 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
@@ -33,10 +33,10 @@ index c2d8579..ba4906f 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 c125770..adeac68 100644
+index 7713b8a..18960e5 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -405,6 +405,9 @@ static int have_homedir_inotify;
+@@ -415,6 +415,9 @@ static int have_homedir_inotify;
* works reliable. */
static int reliable_homedir_inotify;
@@ -46,7 +46,7 @@ index c125770..adeac68 100644
/* Number of active connections. */
static int active_connections;
-@@ -2093,7 +2096,7 @@ get_agent_scd_notify_event (void)
+@@ -2116,7 +2119,7 @@ get_agent_scd_notify_event (void)
GetCurrentProcess(), &h2,
EVENT_MODIFY_STATE|SYNCHRONIZE, TRUE, 0))
{
@@ -55,7 +55,7 @@ index c125770..adeac68 100644
w32_strerror (-1) );
CloseHandle (h);
}
-@@ -2435,6 +2438,10 @@ handle_signal (int signo)
+@@ -2459,6 +2462,10 @@ handle_signal (int signo)
agent_sigusr2_action ();
break;
@@ -66,7 +66,7 @@ index c125770..adeac68 100644
case SIGTERM:
if (!shutdown_pending)
log_info ("SIGTERM received - shutting down ...\n");
-@@ -2773,6 +2780,13 @@ start_connection_thread_ssh (void *arg)
+@@ -2797,6 +2804,13 @@ start_connection_thread_ssh (void *arg)
}
@@ -80,7 +80,7 @@ index c125770..adeac68 100644
/* helper function for readability: test whether a given struct
timespec is set to all-zeros */
static inline int
-@@ -2842,8 +2856,10 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2866,8 +2880,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 8d583ab..baf41ad 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 1adc946..492f1ff 100644
+index 3b89f9b..f071de8 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -3009,6 +3009,8 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3033,6 +3033,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 211900a..bd0c4f4 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 adeac68..1adc946 100644
+index 18960e5..3b89f9b 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2345,6 +2345,26 @@ create_directories (void)
+@@ -2369,6 +2369,26 @@ create_directories (void)
}
@@ -69,7 +69,7 @@ index adeac68..1adc946 100644
/* This is the worker for the ticker. It is called every few seconds
and may only do fast operations. */
-@@ -2695,7 +2715,8 @@ do_start_connection_thread (ctrl_t ctrl)
+@@ -2719,7 +2739,8 @@ do_start_connection_thread (ctrl_t ctrl)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -79,7 +79,7 @@ index adeac68..1adc946 100644
return NULL;
}
-@@ -2775,7 +2796,8 @@ start_connection_thread_ssh (void *arg)
+@@ -2799,7 +2820,8 @@ start_connection_thread_ssh (void *arg)
agent_deinit_default_ctrl (ctrl);
xfree (ctrl);
@@ -89,7 +89,7 @@ index adeac68..1adc946 100644
return NULL;
}
-@@ -2985,6 +3007,9 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3009,6 +3031,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 b5c96f1..db35a73 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 59b046b..c125770 100644
+index ae525ae..7713b8a 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
-@@ -2348,12 +2348,8 @@ create_directories (void)
+@@ -2372,12 +2372,8 @@ create_directories (void)
static void
handle_tick (void)
{
@@ -47,7 +47,7 @@ index 59b046b..c125770 100644
/* Check whether the scdaemon has died and cleanup in this case. */
agent_scd_check_aliveness ();
-@@ -2373,15 +2369,6 @@ handle_tick (void)
+@@ -2397,15 +2393,6 @@ handle_tick (void)
}
#endif /*HAVE_W32_SYSTEM*/
@@ -63,7 +63,7 @@ index 59b046b..c125770 100644
/* Check whether the homedir is still available. */
if (!shutdown_pending
&& (!have_homedir_inotify || !reliable_homedir_inotify)
-@@ -2786,6 +2773,15 @@ start_connection_thread_ssh (void *arg)
+@@ -2810,6 +2797,15 @@ start_connection_thread_ssh (void *arg)
}
@@ -79,7 +79,7 @@ index 59b046b..c125770 100644
/* Connection handler loop. Wait for connection requests and spawn a
thread after accepting a connection. */
static void
-@@ -2803,9 +2799,11 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2827,9 +2823,11 @@ handle_connections (gnupg_fd_t listen_fd,
gnupg_fd_t fd;
int nfd;
int saved_errno;
@@ -91,7 +91,7 @@ index 59b046b..c125770 100644
#ifdef HAVE_W32_SYSTEM
HANDLE events[2];
unsigned int events_set;
-@@ -2822,6 +2820,14 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2846,6 +2844,14 @@ handle_connections (gnupg_fd_t listen_fd,
{ "browser", start_connection_thread_browser },
{ "ssh", start_connection_thread_ssh }
};
@@ -106,7 +106,7 @@ index 59b046b..c125770 100644
ret = npth_attr_init(&tattr);
-@@ -2929,9 +2935,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2953,9 +2959,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 59b046b..c125770 100644
for (;;)
{
/* Shutdown test. */
-@@ -2966,18 +2969,46 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -2990,18 +2993,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 59b046b..c125770 100644
npth_sigev_sigmask ());
saved_errno = errno;
-@@ -2987,7 +3018,7 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3011,7 +3042,7 @@ handle_connections (gnupg_fd_t listen_fd,
handle_signal (signo);
}
#else
@@ -181,7 +181,7 @@ index 59b046b..c125770 100644
events, &events_set);
saved_errno = errno;
-@@ -3032,7 +3063,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3056,7 +3087,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 08236d4..f3d5feb 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,7 +20,7 @@ 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 0accf93..06b53ec 100644
+index 6541aaf..15739ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,7 +314,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
diff --git a/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch b/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
index cb98784..5505f83 100644
--- a/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
+++ b/debian/patches/update-defaults/gpg-Prefer-SHA-512-and-SHA-384-in-personal-digest.patch
@@ -1,5 +1,5 @@
From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Wed, 03 Jan 2018 12:34:26 -0500
+Date: Wed, 3 Jan 2018 12:34:26 -0500
Subject: gpg: Prefer SHA-512 and SHA-384 in personal-digest-preferences.
* g10/keygen.c (keygen_set_std_prefs): prefer SHA-512
@@ -18,9 +18,11 @@ Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
g10/keygen.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
+diff --git a/g10/keygen.c b/g10/keygen.c
+index 99df58a..4354e92 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
-@@ -386,16 +386,16 @@
+@@ -386,16 +386,16 @@ keygen_set_std_prefs (const char *string,int personal)
if (personal)
{
/* The default internal 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