Fri May 30 12:30:07 2008 UTC ()
Fix build problem under Mac OS X caused by broken code to support
getpeereid() .


(tron)
diff -r1.25 -r1.26 pkgsrc/security/gnome-keyring/distinfo
diff -r1.2 -r1.3 pkgsrc/security/gnome-keyring/patches/patch-ad
cvs diff -r1.25 -r1.26 pkgsrc/security/gnome-keyring/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/distinfo 2008/05/29 10:47:52 1.25
+++ pkgsrc/security/gnome-keyring/distinfo 2008/05/30 12:30:07 1.26
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.25 2008/05/29 10:47:52 drochner Exp $ 1$NetBSD: distinfo,v 1.26 2008/05/30 12:30:07 tron Exp $
2 2
3SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b 3SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b
4RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e 4RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e
5Size (gnome-keyring-2.22.2.tar.bz2) = 904890 bytes 5Size (gnome-keyring-2.22.2.tar.bz2) = 904890 bytes
6SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2 6SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2
7SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c 7SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c
8SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 8SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7
9SHA1 (patch-ad) = 2247ee2cc1b2a3328e686e222c17fe08e6fbd964 9SHA1 (patch-ad) = 7012f00f1279cb3ed8f1a52aba3df79579f3a339
cvs diff -r1.2 -r1.3 pkgsrc/security/gnome-keyring/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/patches/Attic/patch-ad 2008/05/29 10:47:52 1.2
+++ pkgsrc/security/gnome-keyring/patches/Attic/patch-ad 2008/05/30 12:30:07 1.3
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: patch-ad,v 1.2 2008/05/29 10:47:52 drochner Exp $ 1$NetBSD: patch-ad,v 1.3 2008/05/30 12:30:07 tron Exp $
2 2
3--- common/gkr-unix-credentials.c.orig 2008-05-26 18:03:16.000000000 +0200 3--- common/gkr-unix-credentials.c.orig 2008-05-30 13:10:12.000000000 +0100
4+++ common/gkr-unix-credentials.c 4+++ common/gkr-unix-credentials.c 2008-05-30 13:16:17.000000000 +0100
5@@ -126,7 +126,6 @@ gkr_unix_credentials_read (int sock, pid 5@@ -134,8 +134,8 @@
6 cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr); 6 if (getpeereid (sock, &euid, &egid) == 0) {
7 *pid = 0; 7 *uid = euid;
8 *uid = cred->sc_euid; 8 } else {
9- set_local_creds(sock, FALSE); 9- g_warning ("getpeereid() failed: %s", strerror (errno));
10 #elif defined(HAVE_GETPEEREID) /* OpenBSD */ 10- return FALSE;
11 uid_t euid; 11+ fprintf (stderr, "getpeereid() failed: %s", strerror (errno));
12 gid_t egid; 12+ return -1;
 13 }
 14 #elif defined(HAVE_GETPEERUCRED)
 15 ucred_t *uc = NULL;