[Pkg-gnupg-commit] [gnupg2] 19/20: refreshed patches
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Dec 1 01:51:57 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 f697b0ad7c13b99b54f117aea9f0e742b25290c5
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Nov 30 19:06:27 2017 -0500
refreshed patches
---
.../Avoid-simple-memory-dumps-via-ptrace.patch | 6 +++---
.../avoid-regenerating-defsincdate-use-shipped-file.patch | 4 ++--
.../agent-compile-time-configuration-of-s2k-calibration.patch | 8 ++++----
.../g10-Select-a-secret-key-by-checking-availability-und.patch | 10 +++++-----
.../agent-Allow-threads-to-interrupt-main-select-loop-wi.patch | 2 +-
.../agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch | 2 +-
.../agent-Avoid-tight-timer-tick-when-possible.patch | 2 +-
.../agent-Create-framework-of-scheduled-timers.patch | 4 ++--
.../gpg-Default-to-SHA-512-for-all-signature-types-on-RS.patch | 2 +-
9 files changed, 20 insertions(+), 20 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 f92c999..86b1941 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 2e19d19..c893442 100644
+index 0b2b982..59b046b 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -48,6 +48,9 @@
@@ -48,10 +48,10 @@ index 2e19d19..c893442 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 dc1fc1a..b227def 100644
+index fb6f0da..e7a85c5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1355,6 +1355,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1356,6 +1356,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/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch b/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch
index a9ef89d..6a07e07 100644
--- a/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/avoid-regenerating-defsincdate-use-shipped-file.patch
@@ -18,10 +18,10 @@ the datestamp unreproducible.
1 file changed, 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 89079b3..33b803b 100644
+index aba84ba..71e2a19 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -168,13 +168,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
+@@ -176,13 +176,6 @@ $(myman_pages) gnupg.7 : yat2m-stamp defs.inc
dist-hook: defsincdate
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 86d249d..a4dcb9f 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,10 +16,10 @@ GnuPG-bug-id: 3399
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/agent/protect.c b/agent/protect.c
-index 3073fc4..fe44f18 100644
+index 9bb2da6..90690d9 100644
--- a/agent/protect.c
+++ b/agent/protect.c
-@@ -159,7 +159,7 @@ calibrate_s2k_count_one (unsigned long count)
+@@ -163,7 +163,7 @@ calibrate_s2k_count_one (unsigned long count)
/* Measure the time we need to do the hash operations and deduce an
@@ -28,7 +28,7 @@ index 3073fc4..fe44f18 100644
static unsigned long
calibrate_s2k_count (void)
{
-@@ -171,11 +171,11 @@ calibrate_s2k_count (void)
+@@ -175,11 +175,11 @@ calibrate_s2k_count (void)
ms = calibrate_s2k_count_one (count);
if (opt.verbose > 1)
log_info ("S2K calibration: %lu -> %lums\n", count, ms);
@@ -43,7 +43,7 @@ index 3073fc4..fe44f18 100644
count *= 1024;
if (count < 65536)
diff --git a/configure.ac b/configure.ac
-index b227def..83717eb 100644
+index e7a85c5..0accf93 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 626af07..2724a7c 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 c58e8ff..7061f51 100644
+index f73e443..0a741cb 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 c58e8ff..7061f51 100644
static void print_status_key_considered (kbnode_t keyblock, unsigned int flags);
-@@ -1734,7 +1734,7 @@ get_pubkey_fromfile (ctrl_t ctrl, PKT_public_key *pk, const char *fname)
+@@ -1735,7 +1735,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 c58e8ff..7061f51 100644
print_status_key_considered (keyblock, infoflags);
if (found_key)
pk_from_block (pk, keyblock, found_key);
-@@ -3485,7 +3485,7 @@ merge_selfsigs (ctrl_t ctrl, kbnode_t keyblock)
+@@ -3486,7 +3486,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 c58e8ff..7061f51 100644
{
kbnode_t k;
-@@ -3627,6 +3627,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
+@@ -3628,6 +3628,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
continue;
}
@@ -60,7 +60,7 @@ index c58e8ff..7061f51 100644
if (DBG_LOOKUP)
log_debug ("\tsubkey might be fine\n");
/* In case a key has a timestamp of 0 set, we make sure
-@@ -3814,7 +3821,7 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
+@@ -3815,7 +3822,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/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 111e0de..e7ba390 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,7 +33,7 @@ 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 bae28af..2c50865 100644
+index c125770..adeac68 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -405,6 +405,9 @@ static int have_homedir_inotify;
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 c5d95e2..8d583ab 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,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 2814529..b926fd0 100644
+index 1adc946..492f1ff 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -3009,6 +3009,8 @@ handle_connections (gnupg_fd_t listen_fd,
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 1e1c618..211900a 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,7 +39,7 @@ index cf61a35..d8fe35a 100644
leave:
xfree (abs_homedir);
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
-index 2c50865..2814529 100644
+index adeac68..1adc946 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2345,6 +2345,26 @@ create_directories (void)
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 d838f95..b5c96f1 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,7 +31,7 @@ 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 c893442..bae28af 100644
+index 59b046b..c125770 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -2348,12 +2348,8 @@ create_directories (void)
@@ -181,7 +181,7 @@ index c893442..bae28af 100644
events, &events_set);
saved_errno = errno;
-@@ -3010,7 +3041,6 @@ handle_connections (gnupg_fd_t listen_fd,
+@@ -3032,7 +3063,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 74650ff..08236d4 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 83717eb..e71379f 100644
+index 0accf93..06b53ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,7 +314,7 @@ GNUPG_GPG_DISABLE_ALGO([rmd160],[RIPE-MD160 hash])
--
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