[gnupg2] fix a bug that shows up with the new libgcrypt release (#725369)

[Tomáš Mráz]

commit fbf259bb8a07fd12ad8996a0f8aced4071d41b4a
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Jul 25 19:26:53 2011 +0200

    fix a bug that shows up with the new libgcrypt release (#725369)

 gnupg-2.0.17-libgcrypt-mpi.patch |   28 ++++++++++++++++++++++++++++
 gnupg2.spec                      |    9 +++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/gnupg-2.0.17-libgcrypt-mpi.patch b/gnupg-2.0.17-libgcrypt-mpi.patch
new file mode 100644
index 0000000..0855dd4
--- /dev/null
+++ b/gnupg-2.0.17-libgcrypt-mpi.patch
@@ -0,0 +1,28 @@
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blobdiff_plain;f=g10%2Fpkglue.c;h=5c47511f7236cbde17a2a983bc597950be830475;hp=cbfe21ea89f4088033e660c5210178a535fb86c9;hb=13290b0e0fcf3a493e4848b29329d56b69bc4dd9;hpb=af497d52c3c88d1cdbedf1c7c2ce2f21f2bc9ad4
+
+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 */
diff --git a/gnupg2.spec b/gnupg2.spec
index 9456adb..f5aefd2 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,8 +1,7 @@
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -12,6 +11,8 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
 #Source0: gnupg2-20090809svn.tar.bz2
 Patch2:  gnupg-2.0.16-tests-s2kcount.patch
 Patch3:  gnupg-2.0.14-secmem.patch
+# This is already in upstream sources
+Patch4:  gnupg-2.0.17-libgcrypt-mpi.patch
 
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -64,6 +65,7 @@ to the base GnuPG package
 
 %patch2 -p1 -b .s2k
 %patch3 -p1 -b .secmem
+%patch4 -p1 -b .mpi
 
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
@@ -165,6 +167,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 25 2011 Tomas Mraz <tmraz at redhat.com> - 2.0.17-2
+- fix a bug that shows up with the new libgcrypt release (#725369)
+
 * Thu Jan 20 2011 Tomas Mraz <tmraz at redhat.com> - 2.0.17-1
 - new upstream release (#669611)