[Pkg-gnupg-commit] [gnupg2] 196/205: refresh patches

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 4122d68abb0bff2d3b2e8932555f36b35c65d713
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 21:10:55 2016 -0400

    refresh patches
---
 debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch    | 8 ++++----
 ...0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch b/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
index 805a478..fdd84a7 100644
--- a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/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 8aab2b9..0f23a4a 100644
+index a950530..efefc48 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
 @@ -48,6 +48,9 @@
@@ -34,7 +34,7 @@ index 8aab2b9..0f23a4a 100644
  
  #define GNUPG_COMMON_NEED_AFLOCAL
  #include "agent.h"
-@@ -746,6 +749,11 @@ main (int argc, char **argv )
+@@ -750,6 +753,11 @@ main (int argc, char **argv )
    struct assuan_malloc_hooks malloc_hooks;
  
    early_system_init ();
@@ -47,10 +47,10 @@ index 8aab2b9..0f23a4a 100644
    /* Before we do anything else we save the list of currently open
       file descriptors and the signal mask.  This info is required to
 diff --git a/configure.ac b/configure.ac
-index 323d1c4..dd16763 100644
+index 6aeca17..be944fb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1322,6 +1322,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1373,6 +1373,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/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch b/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
index a77ce17..c616888 100644
--- a/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
+++ b/debian/patches/0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
@@ -7,10 +7,10 @@ Subject: avoid gpgtar.test when --disable-gpgtar is configured
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
-index a04b62c..92b4097 100644
+index bab0b7d..98121f9 100644
 --- a/tests/openpgp/Makefile.am
 +++ b/tests/openpgp/Makefile.am
-@@ -31,6 +31,13 @@ else
+@@ -41,6 +41,13 @@ else
  sqlite3_dependent_tests =
  endif
  
@@ -24,7 +24,7 @@ index a04b62c..92b4097 100644
  # Note: version.test needs to be the first test to run and finish.test
  # the last one
  TESTS = version.test mds.test \
-@@ -46,7 +53,7 @@ TESTS = version.test mds.test \
+@@ -56,7 +63,7 @@ TESTS = version.test mds.test \
  	multisig.test verify.test armor.test \
  	import.test ecc.test 4gb-packet.test \
  	$(sqlite3_dependent_tests) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git