[packages/dirmngr] - Added patch against libgcrypt-1.6.0 (https://bugs.g10code.com/gnupg/issue1590).
lmasko
lmasko at pld-linux.org
Tue Jan 28 14:27:09 CET 2014
commit f0ceae5533f7856b0ce7e117fcdc7fa3b184eee2
Author: Lukasz Masko <lmasko at pld-linux.org>
Date: Tue Jan 28 14:26:22 2014 +0100
- Added patch against libgcrypt-1.6.0
(https://bugs.g10code.com/gnupg/issue1590).
dirmngr-pth.patch | 17 +++++++++++++++++
dirmngr.spec | 2 ++
2 files changed, 19 insertions(+)
---
diff --git a/dirmngr.spec b/dirmngr.spec
index 15ec2bc..439a7e0 100644
--- 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
diff --git a/dirmngr-pth.patch b/dirmngr-pth.patch
new file mode 100644
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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dirmngr.git/commitdiff/f0ceae5533f7856b0ce7e117fcdc7fa3b184eee2
More information about the pld-cvs-commit
mailing list