[pkgsrc/trunk]: pkgsrc/security/gnupg Use upstream version of dlerror() fix.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4d4b72cfe60
branches:  trunk
changeset: 610828:c4d4b72cfe60
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Nov 07 21:07:37 2012 +0000

description:
Use upstream version of dlerror() fix.

diffstat:

 security/gnupg/distinfo                         |   4 +-
 security/gnupg/patches/patch-aa                 |  18 -----------------
 security/gnupg/patches/patch-cipher_idea-stub.c |  26 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 20 deletions(-)

diffs (70 lines):

diff -r 5f6fb1d64dee -r c4d4b72cfe60 security/gnupg/distinfo
--- a/security/gnupg/distinfo   Wed Nov 07 21:06:11 2012 +0000
+++ b/security/gnupg/distinfo   Wed Nov 07 21:07:37 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2012/11/07 12:23:23 wiz Exp $
+$NetBSD: distinfo,v 1.55 2012/11/07 21:07:37 wiz Exp $
 
 SHA1 (gnupg-1.4.12.tar.bz2) = 9b78e20328d35525af7b8a9c1cf081396910e937
 RMD160 (gnupg-1.4.12.tar.bz2) = d5f4367c9a636d778b6ccb2711bfba6597c27fa0
@@ -6,7 +6,7 @@
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
 RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d
 Size (idea.c.gz) = 5216 bytes
-SHA1 (patch-aa) = ad76abec765e95209f884da7701ea4566ddf35f3
 SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
 SHA1 (patch-ak) = cf3afbd3de520c7cc15f8f026e90df6ea8c56367
+SHA1 (patch-cipher_idea-stub.c) = 0df4fd8820521b97ad239a0da9bc276d7962e404
 SHA1 (patch-mpi_mpi-inline.h) = 36887f60ef01958c9d988e6a7dbf8af7215f224e
diff -r 5f6fb1d64dee -r c4d4b72cfe60 security/gnupg/patches/patch-aa
--- a/security/gnupg/patches/patch-aa   Wed Nov 07 21:06:11 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2010/10/21 21:48:12 wiz Exp $
-
-Only check dlerror() if dlsym failed.
-
---- cipher/idea-stub.c.orig    2005-12-08 06:58:36.000000000 +0000
-+++ cipher/idea-stub.c
-@@ -133,9 +133,9 @@ load_module (const char *name)
-     }
- 
-   sym = dlsym (handle, "idea_get_info");
--  if (dlerror ())
-+  if ((sym == NULL) && dlerror ())
-     sym = dlsym (handle, "_idea_get_info");
--  if ((err=dlerror())) 
-+  if ((sym == NULL) && (err=dlerror())) 
-     goto failure;
- 
-   return (INFO_FNC)sym;
diff -r 5f6fb1d64dee -r c4d4b72cfe60 security/gnupg/patches/patch-cipher_idea-stub.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnupg/patches/patch-cipher_idea-stub.c   Wed Nov 07 21:07:37 2012 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-cipher_idea-stub.c,v 1.1 2012/11/07 21:07:38 wiz Exp $
+
+commit c3a5448379cdf07b408a265fe8f477901524170d
+Author: Werner Koch <wk%gnupg.org@localhost>
+Date:   Wed Nov 7 21:38:27 2012 +0100
+
+    Fix usage of dlerror to conform to POSIX.
+
+    * cipher/idea-stub.c: Clear last error before dlsym.
+    --
+
+    This is required for NetBSD.
+
+    Reported-by: Thomas Klausner
+
+--- cipher/idea-stub.c.orig    2012-01-20 10:51:15.000000000 +0000
++++ cipher/idea-stub.c
+@@ -130,6 +130,8 @@ load_module (const char *name)
+       goto failure;
+     }
+ 
++  dlerror ();  /* Clear old errors or initialize dlerror.  */
++
+   sym = dlsym (handle, "idea_get_info");
+   if (dlerror ())
+     sym = dlsym (handle, "_idea_get_info");