- Added patch against libgcrypt-1.6.0

  (https://bugs.g10code.com/gnupg/issue1590).

diff --git a/dirmngr-pth.patch b/dirmngr-pth.patch
new file mode 100644 (file)
index 0000000..862458e
--- /dev/null
+++ b/dirmngr-pth.patch
@@ -0,0 +1,17 @@
+Index: src/dirmngr.c
+===================================================================
+--- src/dirmngr.c      (revision 348)
++++ src/dirmngr.c      (working copy)
+@@ -665,8 +665,11 @@
+      the option parsing may need services of the libraries. */
+ 
+   /* Libgcrypt requires us to register the threading model first.
+-     Note that this will also do the pth_init. */
++     Note that this will also do the pth_init for libgcrypt < 1.6 */
+ 
++#if GCRYPT_VERSION_NUMBER >= 0x010600
++  pth_init ();
++#endif
+   /* Init Libgcrypt. */
+   rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
+   if (rc)

diff --git a/dirmngr.spec b/dirmngr.spec
index 15ec2bcc5139986b0bac97fc37a680b92fc9ba24..439a7e07664a2237be9796fc63975b40f9ae4a67 100644 (file)
--- a/dirmngr.spec
+++ b/dirmngr.spec
@@ -9,6 +9,7 @@ Source0:        ftp://ftp.gnupg.org/gcrypt/dirmngr/%{name}-%{version}.tar.bz2
 # Source0-md5: f5a40e93bcf07a94522579bfd58a2c96
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-am.patch
+Patch2:                %{name}-pth.patch
 URL:           http://www.gnupg.org/documentation/manuals/dirmngr/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9.3
@@ -41,6 +42,7 @@ wywoływany przez gpgsm i nie używany bezpośrednio.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %build
 %{__aclocal} -I m4