[Pkg-gnupg-commit] [gnupg2] 238/241: refresh debian patches

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Dec 9 20:32:28 UTC 2015


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

dkg pushed a commit to branch master
in repository gnupg2.

commit a4b80ac4b84cccba9a1e2ef80cd960c0f89fabc1
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Dec 9 12:06:53 2015 -0500

    refresh debian patches
---
 debian/patches/0001-rename-gnupg2.patch                        | 6 +++---
 debian/patches/0002-avoid-beta-warning.patch                   | 2 +-
 debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0001-rename-gnupg2.patch b/debian/patches/0001-rename-gnupg2.patch
index cf56a16..b5b34c0 100644
--- a/debian/patches/0001-rename-gnupg2.patch
+++ b/debian/patches/0001-rename-gnupg2.patch
@@ -7,7 +7,7 @@ Subject: rename gnupg2
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 27fc9a9..4e39df9 100644
+index 412ea8b..de3d842 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -25,7 +25,7 @@ min_automake_version="1.14"
@@ -18,8 +18,8 @@ index 27fc9a9..4e39df9 100644
 +m4_define([mym4_package],[gnupg2])
  m4_define([mym4_major], [2])
  m4_define([mym4_minor], [1])
- m4_define([mym4_micro], [9])
-@@ -72,7 +72,7 @@ NEED_GNUTLS_VERSION=3.0
+ m4_define([mym4_micro], [10])
+@@ -73,7 +73,7 @@ NEED_SQLITE_VERSION=3.7
  
  development_version=mym4_isbeta
  PACKAGE=$PACKAGE_NAME
diff --git a/debian/patches/0002-avoid-beta-warning.patch b/debian/patches/0002-avoid-beta-warning.patch
index 3799cab..1189fbd 100644
--- a/debian/patches/0002-avoid-beta-warning.patch
+++ b/debian/patches/0002-avoid-beta-warning.patch
@@ -19,7 +19,7 @@ See discussion at:
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/autogen.sh b/autogen.sh
-index 7effd56..5e8ca15 100755
+index 3fe24ea..0bdb019 100755
 --- a/autogen.sh
 +++ b/autogen.sh
 @@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
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 18fcbed..84c7fea 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 f81a2fb..d749d58 100644
+index b60287d..233e848 100644
 --- a/agent/gpg-agent.c
 +++ b/agent/gpg-agent.c
 @@ -48,6 +48,9 @@
@@ -47,10 +47,10 @@ index f81a2fb..d749d58 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 4e39df9..9adfb77 100644
+index de3d842..457ec81 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1249,6 +1249,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])
+@@ -1311,6 +1311,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])

-- 
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