[147633] trunk/dports/security/dirmngr

[khindenburg at macports.org]

Revision: 147633
          https://trac.macports.org/changeset/147633
Author:   khindenburg at macports.org
Date:     2016-04-10 19:01:10 -0700 (Sun, 10 Apr 2016)
Log Message:
-----------
dirmngr: add patch to fix crash #46528

Modified Paths:
--------------
    trunk/dports/security/dirmngr/Portfile

Added Paths:
-----------
    trunk/dports/security/dirmngr/files/
    trunk/dports/security/dirmngr/files/patch-dirmngr-pth-fix.diff

Modified: trunk/dports/security/dirmngr/Portfile
===================================================================
--- trunk/dports/security/dirmngr/Portfile	2016-04-11 00:57:39 UTC (rev 147632)
+++ trunk/dports/security/dirmngr/Portfile	2016-04-11 02:01:10 UTC (rev 147633)
@@ -5,7 +5,7 @@
 
 name                dirmngr
 version             1.1.1
-revision            1
+revision            2
 categories          security mail
 license             GPL-2+
 maintainers         nomaintainer
@@ -26,6 +26,8 @@
 checksums           rmd160  f376b6cc874e275a11093dac0db6f9dc1c78d548 \
                     sha256  d2280b8c314db80cdaf101211a47826734443436f5c3545cc1b614c50eaae6ff
 
+patchfiles          patch-dirmngr-pth-fix.diff
+
 depends_lib         port:libiconv       \
                     port:gettext        \
                     port:libassuan      \

Added: trunk/dports/security/dirmngr/files/patch-dirmngr-pth-fix.diff
===================================================================
--- trunk/dports/security/dirmngr/files/patch-dirmngr-pth-fix.diff	                        (rev 0)
+++ trunk/dports/security/dirmngr/files/patch-dirmngr-pth-fix.diff	2016-04-11 02:01:10 UTC (rev 147633)
@@ -0,0 +1,18 @@
+# https://bugs.g10code.com/gnupg/issue1590
+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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160410/f891cfda/attachment.html>