Bug#699245: gpgme1.0: Fix potential FTBFS in t-encrypt-sign testcase by updating gnupg.

[Chris J Arges]

Package: gpgme1.0
Version: 1.2.0-1.4
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch

Dear Maintainer,

When using newer versions of gnupg this package FTBFS. By taking a portion of 
this
upstream patch and applying it to the failed testcase, it passes and the 
package builds.

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/fix-t-encrypt-sign.dpatch:
    - Fixes FTBFS by updating the t-encrypt-sign test for use with a
      newer version of GnuPG.


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-36-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u gpgme1.0-1.2.0/debian/changelog gpgme1.0-1.2.0/debian/changelog
diff -u gpgme1.0-1.2.0/debian/patches/00list gpgme1.0-1.2.0/debian/patches/00list
--- gpgme1.0-1.2.0/debian/patches/00list
+++ gpgme1.0-1.2.0/debian/patches/00list
@@ -4,0 +5 @@
+fix-t-encrypt-sign.dpatch
only in patch2:
unchanged:
--- gpgme1.0-1.2.0.orig/debian/patches/fix-t-encrypt-sign.dpatch
+++ gpgme1.0-1.2.0/debian/patches/fix-t-encrypt-sign.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-t-encrypt-sign.dpatch by Chris J Arges <chris.j.ar...@canonical.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes t-encrypt-sign testcase by allowing RMD160 hash algorithm.
+## DP: Origin: upstream, http://gitorious.org/gnupg-org/gpgme/commit/43f38db1afe9830b888076adeec1eec21f32335c
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpgme1.0-1.2.0~/tests/gpg/t-encrypt-sign.c gpgme1.0-1.2.0/tests/gpg/t-encrypt-sign.c
+--- gpgme1.0-1.2.0~/tests/gpg/t-encrypt-sign.c	2005-09-08 09:42:32.000000000 -0500
++++ gpgme1.0-1.2.0/tests/gpg/t-encrypt-sign.c	2013-01-28 15:07:49.755170137 -0600
+@@ -60,7 +60,8 @@
+ 	       result->signatures->pubkey_algo);
+       exit (1);
+     }
+-  if (result->signatures->hash_algo != GPGME_MD_SHA1)
++  if (result->signatures->hash_algo != GPGME_MD_SHA1
++      && result->signatures->hash_algo != GPGME_MD_RMD160)
+     {
+       fprintf (stderr, "Wrong hash algorithm reported: %i\n",
+ 	       result->signatures->hash_algo);