Merge lp:~mbp/ubuntu/oneiric/gnupg2/815190-assertion into lp:ubuntu/oneiric/gnupg2

[Martin Pool]

This takes a patch from upstream, identified by Anders Kaseorg, to fix an assertion warning that makes gpg intermittently(?) fail in Oneiric.

There is a test package of this in

https://launchpad.net/~mbp/+archive/ppa/

[Sebastien Bacher (seb128)]

Could you update the changelog to mention "upload to test ppa"? is Dave going to sponsor the upload?

[Dave Walker (davewalker)]

Apologies for the delay. I backed out the last commit and uploaded, Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-25 14:27:35 +0000
+++ debian/changelog	2011-08-11 03:27:30 +0000
@@ -1,3 +1,14 @@
+gnupg2 (2.0.17-2ubuntu2) oneiric; urgency=low
+
+  [ Anders Kaseorg ]
+  * debian/patches/gnupg2-fix-libgcrypt.diff: Fix assertion failure with
+    libgcrypt 1.5.0.  (LP: #815190)
+
+  [ Martin Pool ]
+  * Upload to test PPA.
+
+ -- Martin Pool <[e-mail]>  Thu, 11 Aug 2011 12:57:11 +1000
+
 gnupg2 (2.0.17-2ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable. Remaining changes:

=== added file 'debian/patches/gnupg2-fix-libgcrypt.diff'
--- debian/patches/gnupg2-fix-libgcrypt.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/gnupg2-fix-libgcrypt.diff	2011-08-11 03:27:30 +0000
@@ -0,0 +1,42 @@
+From: Werner Koch <[e-mail]>
+Subject: [PATCH] Fix a for a bug fix in the latest Libgcrypt.
+
+        * pkglue.c (mpi_from_sexp, pk_decrypt): Use GCRYMPI_FMT_USG for
+	gcry_sexp_nth_mpi.  This fixes a problem with a recent bug fix in
+	Libgcrypt.
+
+Origin: upstream, http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=13290b0e0fcf3a493e4848b29329d56b69bc4dd9
+Last-Update: 2011-07-23
+---
+ g10/pkglue.c  |    6 +-
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/g10/pkglue.c b/g10/pkglue.c
+index cbfe21e..5c47511 100644
+--- a/g10/pkglue.c
++++ b/g10/pkglue.c
+@@ -34,10 +34,10 @@ mpi_from_sexp (gcry_sexp_t sexp, const char * item)
+ {
+   gcry_sexp_t list;
+   gcry_mpi_t data;
+-  
++
+   list = gcry_sexp_find_token (sexp, item, 0);
+   assert (list);
+-  data = gcry_sexp_nth_mpi (list, 1, 0);
++  data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
+   assert (data);
+   gcry_sexp_release (list);
+   return data;
+@@ -293,7 +293,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
+   if (rc)
+     return rc;
+ 
+-  *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
++  *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
+   gcry_sexp_release (s_plain);
+   if (!*result)
+     return -1;			/* oops */
+-- 
+1.7.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-25 14:27:35 +0000
+++ debian/patches/series	2011-08-11 03:27:30 +0000
@@ -1,3 +1,4 @@
 01-gnupg2-rename.diff
 debian-changes-2.0.17-2
 debian-changes-2.0.17-2ubuntu1
+gnupg2-fix-libgcrypt.diff