diff options
| author | tron <tron> | 2008-05-30 12:30:07 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-05-30 12:30:07 +0000 |
| commit | 79c5e0e9257d2abe277d7c7bbfdff130159f3a54 (patch) | |
| tree | 761675dcb1e6eabaaa3aefb0bbb269d973748448 /security/gnome-keyring | |
| parent | 534b30b3e4364756658e53d1f6290b82878ba1fc (diff) | |
| download | pkgsrc-79c5e0e9257d2abe277d7c7bbfdff130159f3a54.tar.gz | |
Fix build problem under Mac OS X caused by broken code to support
getpeereid() .
Diffstat (limited to 'security/gnome-keyring')
| -rw-r--r-- | security/gnome-keyring/distinfo | 4 | ||||
| -rw-r--r-- | security/gnome-keyring/patches/patch-ad | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index 4d532c10b91..c6f46d8f408 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -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 @@ Size (gnome-keyring-2.22.2.tar.bz2) = 904890 bytes SHA1 (patch-aa) = fff624c298f901bb1a81ac7ad4d781cae5a4cff2 SHA1 (patch-ab) = c6fc864a34ae6ccb0fdf891082146f451203494c SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 -SHA1 (patch-ad) = 2247ee2cc1b2a3328e686e222c17fe08e6fbd964 +SHA1 (patch-ad) = 7012f00f1279cb3ed8f1a52aba3df79579f3a339 diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad index 0f605b340a7..f59f269533e 100644 --- a/security/gnome-keyring/patches/patch-ad +++ b/security/gnome-keyring/patches/patch-ad @@ -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; |