[Pkg-gnupg-commit] [gnupg2] 08/09: fix the patch that avoids describing a build from git as a beta

[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 5596215bbba3219af3d642066b45c50d39ead585
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Apr 1 11:03:56 2016 -0300

    fix the patch that avoids describing a build from git as a beta
---
 debian/patches/0002-avoid-beta-warning.patch              | 15 ++++++++++++---
 .../0003-Avoid-simple-memory-dumps-via-ptrace.patch       |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0002-avoid-beta-warning.patch b/debian/patches/0002-avoid-beta-warning.patch
index acae1ff..ef835ef 100644
--- a/debian/patches/0002-avoid-beta-warning.patch
+++ b/debian/patches/0002-avoid-beta-warning.patch
@@ -15,13 +15,22 @@ See discussion at:
 
  http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
 ---
- autogen.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ autogen.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/autogen.sh b/autogen.sh
-index 7d843bd..0ad720a 100755
+index 7d843bd..75fc3ea 100755
 --- a/autogen.sh
 +++ b/autogen.sh
+@@ -214,7 +214,7 @@ if [ "$myhost" = "find-version" ]; then
+     esac
+ 
+     beta=no
+-    if [ -e .git ]; then
++    if false; then
+       ingit=yes
+       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+       if [ -n "$tmp" ]; then
 @@ -228,8 +228,8 @@ if [ "$myhost" = "find-version" ]; then
        rvd=$((0x$(echo ${rev} | head -c 4)))
      else
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 84a8459..805a478 100644
--- a/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/0003-Avoid-simple-memory-dumps-via-ptrace.patch
@@ -47,7 +47,7 @@ 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 266eae5..d43acb3 100644
+index 323d1c4..dd16763 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1322,6 +1322,7 @@ AC_CHECK_FUNCS([strerror strlwr tcgetattr mmap canonicalize_file_name])

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