diff options
| author | rumko <rumko@pkgsrc.org> | 2015-01-09 16:30:57 +0000 |
|---|---|---|
| committer | rumko <rumko@pkgsrc.org> | 2015-01-09 16:30:57 +0000 |
| commit | 33dcf41452749c5de177355097d5e7e546c59beb (patch) | |
| tree | afe4b6a8d0404e1c8ec1164d1ab82a5f7a7baed3 /security | |
| parent | 48bec98c8cb482e5929b447f71ce37fd374795ad (diff) | |
| download | pkgsrc-33dcf41452749c5de177355097d5e7e546c59beb.tar.gz | |
security/dirmngr: compatibility with libgcrypt>=1.6.0
Before 1.6.0 version, libgcrypt called pth_init() on it's own,
in later version dirmngr has to be the one to call pth_init().
With this dirmngr actually works (does not seg fault immediately).
Since it's a runtime problem, PKGREVISION bumped.
OK@ wiz
Diffstat (limited to 'security')
| -rw-r--r-- | security/dirmngr/Makefile | 4 | ||||
| -rw-r--r-- | security/dirmngr/distinfo | 4 | ||||
| -rw-r--r-- | security/dirmngr/patches/patch-ac | 22 |
3 files changed, 23 insertions, 7 deletions
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index f2164d6c608..c25e8a0f4e3 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2014/11/27 13:31:07 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2015/01/09 16:30:57 rumko Exp $ DISTNAME= dirmngr-1.1.0 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/dirmngr/ EXTRACT_SUFX= .tar.bz2 diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo index 891861127c1..b6b3d9b9f85 100644 --- a/security/dirmngr/distinfo +++ b/security/dirmngr/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.19 2011/05/25 09:29:05 drochner Exp $ +$NetBSD: distinfo,v 1.20 2015/01/09 16:30:57 rumko Exp $ SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165 RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65 Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0 SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0 -SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135 +SHA1 (patch-ac) = 625ba1050021e6cb17af76a4301cdcf6f5aaa92d SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4 SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26 SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837 diff --git a/security/dirmngr/patches/patch-ac b/security/dirmngr/patches/patch-ac index e02c72dc3e0..05ad5414643 100644 --- a/security/dirmngr/patches/patch-ac +++ b/security/dirmngr/patches/patch-ac @@ -1,6 +1,9 @@ -$NetBSD: patch-ac,v 1.5 2009/12/15 19:43:16 drochner Exp $ +$NetBSD: patch-ac,v 1.6 2015/01/09 16:30:57 rumko Exp $ ---- src/dirmngr.c.orig 2008-12-09 10:52:06.000000000 +0000 +With libgcrypt >= 1.6.0, one needs to init pth before init-ing libgcrypt. +Taken from https://bugs.g10code.com/gnupg/issue1590 + +--- src/dirmngr.c.orig 2010-03-13 07:33:58.000000000 +0000 +++ src/dirmngr.c @@ -39,6 +39,7 @@ #include <unistd.h> @@ -10,7 +13,20 @@ $NetBSD: patch-ac,v 1.5 2009/12/15 19:43:16 drochner Exp $ #include <gcrypt.h> #include <ksba.h> -@@ -954,7 +955,10 @@ main (int argc, char **argv) +@@ -656,8 +657,11 @@ main (int argc, char **argv) + 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) +@@ -1014,7 +1018,10 @@ main (int argc, char **argv) len = (offsetof (struct sockaddr_un, sun_path) + strlen (serv_addr.sun_path) + 1); |