[pkgsrc/trunk]: pkgsrc/security/gpgme resolve confusion about different behav...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba532fab7297
branches:  trunk
changeset: 508967:ba532fab7297
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Mar 01 16:22:20 2006 +0000

description:
resolve confusion about different behaviour of getenv_r in librfuncs
and NetBSD-current which caused serius lossage:
depend on librfuncs>=1.0.7nb1 which implements NetBSD-current's
behaviour, change the patch to _gpgme_getenv() accordingly,
and bump PKGREVISION

diffstat:

 security/gpgme/Makefile         |   7 +++++--
 security/gpgme/distinfo         |   4 ++--
 security/gpgme/patches/patch-af |  17 ++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diffs (88 lines):

diff -r ff5d7f3b073f -r ba532fab7297 security/gpgme/Makefile
--- a/security/gpgme/Makefile   Wed Mar 01 15:58:03 2006 +0000
+++ b/security/gpgme/Makefile   Wed Mar 01 16:22:20 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2006/02/11 14:11:07 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/03/01 16:22:20 drochner Exp $
 #
 
 DISTNAME=      gpgme-1.0.3
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpgme/ \
                ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
@@ -47,6 +47,9 @@
 INFO_FILES=            gpgme.info
 
 .include "../../security/libgpg-error/buildlink3.mk"
+
+# we want the getenv_r() semantics of NetBSD-current
+BUILDLINK_DEPENDS.librfuncs+=  librfuncs>=1.0.7nb1
 .include "../../devel/librfuncs/buildlink3.mk"
 
 ##
diff -r ff5d7f3b073f -r ba532fab7297 security/gpgme/distinfo
--- a/security/gpgme/distinfo   Wed Mar 01 15:58:03 2006 +0000
+++ b/security/gpgme/distinfo   Wed Mar 01 16:22:20 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/02/11 14:11:07 joerg Exp $
+$NetBSD: distinfo,v 1.22 2006/03/01 16:22:21 drochner Exp $
 
 SHA1 (gpgme-1.0.3.tar.gz) = 632436ff5c66405d9704983411aa031f29006dce
 RMD160 (gpgme-1.0.3.tar.gz) = cc8dc465c733eea8d7f0297127f9f97dd0876a53
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e
 SHA1 (patch-ac) = 1f27efa0a5c109c7a8b4f4e346487a5d2f8b26f2
 SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
-SHA1 (patch-af) = 9945bd0ed5f999509b8a8684233286b2183009e8
+SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
 SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
 SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e
 SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c
diff -r ff5d7f3b073f -r ba532fab7297 security/gpgme/patches/patch-af
--- a/security/gpgme/patches/patch-af   Wed Mar 01 15:58:03 2006 +0000
+++ b/security/gpgme/patches/patch-af   Wed Mar 01 16:22:20 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/11/07 13:18:16 jmmv Exp $
+$NetBSD: patch-af,v 1.5 2006/03/01 16:22:21 drochner Exp $
 
---- gpgme/get-env.c.orig       2003-09-13 19:45:04.000000000 +0200
+--- gpgme/get-env.c.orig       2004-12-07 21:47:40.000000000 +0100
 +++ gpgme/get-env.c
-@@ -21,6 +21,9 @@
+@@ -22,6 +22,9 @@
  #include <config.h>
  #endif
  #include <stdlib.h>
@@ -12,7 +12,7 @@
  #include <errno.h>
  #include <string.h>
  
-@@ -52,7 +55,26 @@ _gpgme_getenv (const char *name, char **
+@@ -53,7 +56,25 @@ _gpgme_getenv (const char *name, char **
  
  #else
  
@@ -25,17 +25,16 @@
 +_gpgme_getenv (const char *name, char **value)
 +{
 +  char env_value[256];
-+  int err;
-+  if (err = getenv_r (name, env_value, 256))
++  if (getenv_r (name, env_value, 256) < 0)
 +      *value = NULL;
 +  else
 +    {
 +      *value = strdup (env_value);
 +      if (!*value)
-+        err = ENOMEM;
++        errno = ENOMEM;
 +    }
-+  if (err != 0 && err != ENOENT)
-+      return gpg_error_from_errno (err);
++  if (!*value && errno != ENOENT)
++      return gpg_error_from_errno (errno);
 +  else
 +      return (0);
 +}