From 532e197c8410d2f54e2b8bf9ef1b4a6a647abbb2 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Thu, 29 May 2008 10:47:52 +0000
Subject: [PATCH] update to 2.22.2 changes: -minor UI improvements -bugfixes
 -portability improvements, in particular for credential passing on  local
 sockets -- unfortunately a bit of the patch I submitted upstream  got lost

---
 security/gnome-keyring/Makefile         |  4 ++--
 security/gnome-keyring/distinfo         | 10 ++++-----
 security/gnome-keyring/patches/patch-ad | 27 ++++++++-----------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 9803551e2a58..d30d82d0751a 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2008/05/29 10:47:52 drochner Exp $
 
-DISTNAME=	gnome-keyring-2.22.1
+DISTNAME=	gnome-keyring-2.22.2
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/2.22/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 964c749995d8..4d532c10b91d 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2008/04/10 16:53:44 drochner Exp $
+$NetBSD: distinfo,v 1.25 2008/05/29 10:47:52 drochner Exp $
 
-SHA1 (gnome-keyring-2.22.1.tar.bz2) = 59956194b110a4e4576db0791e2d2371b39ff49c
-RMD160 (gnome-keyring-2.22.1.tar.bz2) = 83dddadb1c133931151de302e8f33ff1d99ed496
-Size (gnome-keyring-2.22.1.tar.bz2) = 960392 bytes
+SHA1 (gnome-keyring-2.22.2.tar.bz2) = b3276e2c349b761d167df9bdbb9c19268af2bd4b
+RMD160 (gnome-keyring-2.22.2.tar.bz2) = 9fcf9bee654050ca7f762b5d50e98ef690e8409e
+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) = b0f1633ed5d3e24faf89c96ac730845d1edae8d6
+SHA1 (patch-ad) = 2247ee2cc1b2a3328e686e222c17fe08e6fbd964
diff --git a/security/gnome-keyring/patches/patch-ad b/security/gnome-keyring/patches/patch-ad
index 50a43d0dbd52..0f605b340a77 100644
--- a/security/gnome-keyring/patches/patch-ad
+++ b/security/gnome-keyring/patches/patch-ad
@@ -1,23 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2008/04/10 16:53:44 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2008/05/29 10:47:52 drochner Exp $
 
---- ./common/gkr-unix-credentials.c.orig	2008-02-13 22:07:15.000000000 +0100
-+++ ./common/gkr-unix-credentials.c
-@@ -36,6 +36,10 @@
- #include <ucred.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/un.h> /* for LOCAL_CREDS */
-+#endif
-+
- int
- gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
- {
-@@ -125,7 +129,6 @@ gkr_unix_credentials_read (int sock, pid
+--- 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(fd, FALSE);
- #elif defined(HAVE_GETPEERUCRED)
- 		ucred_t *uc = NULL;
- 
+-		set_local_creds(sock, FALSE);
+ #elif defined(HAVE_GETPEEREID) /* OpenBSD */
+ 		uid_t euid;
+ 		gid_t egid;