Pullup ticket #4531 - requested by he
security/libgpg-error: bug fix patch

Revisions pulled up:
- security/libgpg-error/Makefile                                1.44 via patch
- security/libgpg-error/distinfo                                1.21 via patch
- security/libgpg-error/patches/patch-src_estream.c             1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Wed Oct 29 12:28:50 UTC 2014

   Modified Files:
   	pkgsrc/security/libgpg-error: Makefile distinfo
   Added Files:
   	pkgsrc/security/libgpg-error/patches: patch-src_estream.c

   Log Message:
   Use __attribute__((destructor)) instead of atexit(), so that the
   library wind-down function is both called on dlclose() and exit().
   Should avoid segfault when trying to call the atexit function after
   dlclose() which unmaps the library.  Fixes PR pkg/49333, thanks to
   joerg@ for the suggested fix.

   Also, the IRIX and NetBSD tool name to get at nawk is just "awk",
   flagged by pkglint.

   Bump PKGREVISION.


(tron)

$NetBSD: patch-src_estream.c,v 1.1.2.2 2014/10/29 20:11:31 tron Exp $

Don't use atexit(), since this library mey be dlopen()ed
and dlclose()d before exit() is called.

Instead mark the do_deinit() function as a destructor.

--- src/estream.c.orig	2014-09-11 09:38:21.000000000 +0000
+++ src/estream.c
@@ -471,6 +471,7 @@ do_list_remove (estream_t stream, int wi
 
 
 
+__attribute__((destructor,used))
 static void
 do_deinit (void)
 {
@@ -503,7 +504,16 @@ _gpgrt_es_init (void)
   if (!initialized)
     {
       initialized = 1;
+#if 0
+      /* This library may be unloaded via dlclose() before
+       * exit() is called, causing the atexit handler to try
+       * to jump into unmapped address space, causing a segfault.
+       * This has been observed with apache and php.  Instead, use
+       * the destructor attribute, since that will cause it
+       * to be called on dlclose() as well.
+       */
       atexit (do_deinit);
+#endif
     }
   return 0;
 }