[pkgsrc/trunk]: pkgsrc/security/gnome-keyring Fix build problem under Mac OS ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba7ce52691c6
branches:  trunk
changeset: 542964:ba7ce52691c6
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri May 30 12:30:07 2008 +0000

description:
Fix build problem under Mac OS X caused by broken code to support
getpeereid() .

diffstat:

 security/gnome-keyring/distinfo         |   4 ++--
 security/gnome-keyring/patches/patch-ad |  25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diffs (45 lines):

diff -r 9fe0959bdf04 -r ba7ce52691c6 security/gnome-keyring/distinfo
--- a/security/gnome-keyring/distinfo   Fri May 30 12:29:00 2008 +0000
+++ b/security/gnome-keyring/distinfo   Fri May 30 12:30:07 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2008/05/29 10:47:52 drochner Exp $
+$NetBSD: distinfo,v 1.26 2008/05/30 12:30:07 tron Exp $
 
 SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b
 RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
 SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
 SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
-SHA1 (patch-ad) = 2247ee2cc1b2a3328e686e222c17fe08e6fbd964
+SHA1 (patch-ad) = 7012f00f1279cb3ed8f1a52aba3df79579f3a339
diff -r 9fe0959bdf04 -r ba7ce52691c6 security/gnome-keyring/patches/patch-ad
--- a/security/gnome-keyring/patches/patch-ad   Fri May 30 12:29:00 2008 +0000
+++ b/security/gnome-keyring/patches/patch-ad   Fri May 30 12:30:07 2008 +0000
@@ -1,12 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2008/05/29 10:47:52 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2008/05/30 12:30:07 tron Exp $
 
---- common/gkr-unix-credentials.c.orig 2008-05-26 18:03:16.000000000 +0200
-+++ common/gkr-unix-credentials.c
-@@ -126,7 +126,6 @@ gkr_unix_credentials_read (int sock, pid
-               cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
-               *pid = 0;
-               *uid = cred->sc_euid;
--              set_local_creds(sock, FALSE);
- #elif defined(HAVE_GETPEEREID) /* OpenBSD */
-               uid_t euid;
-               gid_t egid;
+--- common/gkr-unix-credentials.c.orig 2008-05-30 13:10:12.000000000 +0100
++++ common/gkr-unix-credentials.c      2008-05-30 13:16:17.000000000 +0100
+@@ -134,8 +134,8 @@
+               if (getpeereid (sock, &euid, &egid) == 0) {
+                       *uid = euid;
+               } else {
+-                      g_warning ("getpeereid() failed: %s", strerror (errno));
+-                      return FALSE;
++                      fprintf (stderr, "getpeereid() failed: %s", strerror (errno));
++                      return -1;
+               }
+ #elif defined(HAVE_GETPEERUCRED)
+               ucred_t *uc = NULL;