Changes in version 0.6.0 are:

* NetBSD fixes
* Crash fix
* Typo fix
* Translations

Changes in version 0.5.2 are:
* Translation updates
* Better title in docs
* Fixed crashes
* New function: gnome_keyring_item_grant_access_rights_sync

Changes in version 0.5.1 are:
* Support changing password of a keyring
* Create ~/.gnome2 if needed
* Save keyring when an ACL is added
* Add password strength meter
* Small bugfixes

4 files changed, 33 insertions, 115 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index beef5187d96..a47669a3f5d 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.24 2006/08/28 08:30:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2006/09/15 15:08:52 jmmv Exp $
 #
 
-DISTNAME=	gnome-keyring-0.4.9
-PKGREVISION=	3
+DISTNAME=	gnome-keyring-0.6.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/0.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring/0.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME password and secret manager
 
-USE_TOOLS+=		msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index 0451bd65138..a2e1bc1491a 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,19 +1,32 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/09/15 15:08:52 jmmv Exp $
 bin/gnome-keyring-daemon
 include/gnome-keyring-1/gnome-keyring.h
 lib/libgnome-keyring.la
 lib/pkgconfig/gnome-keyring-1.pc
 libexec/gnome-keyring-ask
+share/gtk-doc/html/gnome-keyring/ch01.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring.html
+share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp
+share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2
+share/gtk-doc/html/gnome-keyring/home.png
+share/gtk-doc/html/gnome-keyring/index.html
+share/gtk-doc/html/gnome-keyring/index.sgml
+share/gtk-doc/html/gnome-keyring/left.png
+share/gtk-doc/html/gnome-keyring/right.png
+share/gtk-doc/html/gnome-keyring/style.css
+share/gtk-doc/html/gnome-keyring/up.png
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/bg/LC_MESSAGES/gnome-keyring.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
 share/locale/bs/LC_MESSAGES/gnome-keyring.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring.mo
 share/locale/cy/LC_MESSAGES/gnome-keyring.mo
 share/locale/da/LC_MESSAGES/gnome-keyring.mo
 share/locale/de/LC_MESSAGES/gnome-keyring.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring.mo
 share/locale/el/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
@@ -24,20 +37,28 @@ share/locale/fa/LC_MESSAGES/gnome-keyring.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring.mo
 share/locale/gl/LC_MESSAGES/gnome-keyring.mo
+share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring.mo
 share/locale/hr/LC_MESSAGES/gnome-keyring.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring.mo
 share/locale/id/LC_MESSAGES/gnome-keyring.mo
 share/locale/is/LC_MESSAGES/gnome-keyring.mo
 share/locale/it/LC_MESSAGES/gnome-keyring.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring.mo
 share/locale/mn/LC_MESSAGES/gnome-keyring.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring.mo
 share/locale/ms/LC_MESSAGES/gnome-keyring.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring.mo
-share/locale/no/LC_MESSAGES/gnome-keyring.mo
+share/locale/or/LC_MESSAGES/gnome-keyring.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring.mo
 share/locale/pt/LC_MESSAGES/gnome-keyring.mo
@@ -46,6 +67,7 @@ share/locale/ro/LC_MESSAGES/gnome-keyring.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
@@ -58,4 +80,5 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm share/gtk-doc/html/gnome-keyring
 @dirrm include/gnome-keyring-1
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 7dcdad73f10..b3195bea0d3 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2006/08/28 08:30:12 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2006/09/15 15:08:52 jmmv Exp $
 
-SHA1 (gnome-keyring-0.4.9.tar.bz2) = 56a9f2b634fd0f1b9bd73bab3824d02a77ad34c3
-RMD160 (gnome-keyring-0.4.9.tar.bz2) = 9deca60a67cba29b978974007c59e6963fec900e
-Size (gnome-keyring-0.4.9.tar.bz2) = 396162 bytes
-SHA1 (patch-aa) = b04232b0d1d855d4fa795cf69dd290193ec83bc0
+SHA1 (gnome-keyring-0.6.0.tar.bz2) = 53c5df57c068f3904a296e37ca743666eb42c7bb
+RMD160 (gnome-keyring-0.6.0.tar.bz2) = 9114a0457871b7a4f9cfe6b3e979ab11881c9145
+Size (gnome-keyring-0.6.0.tar.bz2) = 476280 bytes
diff --git a/security/gnome-keyring/patches/patch-aa b/security/gnome-keyring/patches/patch-aa
deleted file mode 100644
index cae92f59244..00000000000
--- a/security/gnome-keyring/patches/patch-aa
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/08/28 08:30:12 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=353105
-
---- gnome-keyring-daemon-io.c.orig	2005-05-04 09:17:18.000000000 +0200
-+++ gnome-keyring-daemon-io.c
-@@ -91,6 +91,24 @@ static void gnome_keyring_client_state_m
- 
- 
- static gboolean
-+set_local_creds (int fd, gboolean on)
-+{
-+  gboolean retval = TRUE;
-+
-+#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
-+  int val = on ? 1 : 0;
-+  if (setsockopt (fd, 0, LOCAL_CREDS, &val, sizeof (val)) < 0)
-+    {
-+      g_warning ("Unable to set LOCAL_CREDS socket option on fd %d\n", fd);
-+      retval = FALSE;
-+    }
-+#endif
-+
-+  return retval;
-+}
-+
-+
-+static gboolean
- read_unix_socket_credentials (int fd,
- 			      pid_t *pid,
- 			      uid_t *uid)
-@@ -102,22 +120,14 @@ read_unix_socket_credentials (int fd,
- #ifdef HAVE_CMSGCRED 
- 	char cmsgmem[CMSG_SPACE (sizeof (struct cmsgcred))];
- 	struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
-+#elif defined(LOCAL_CREDS)
-+	char cmsgmem[CMSG_SPACE (sizeof (struct sockcred))];
-+	struct cmsghdr *cmsg = (struct cmsghdr *) cmsgmem;
- #endif
- 	
- 	*pid = 0;
- 	*uid = 0;
- 	
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
--	/* Set the socket to receive credentials on the next message */
--	{
--		int on = 1;
--		if (setsockopt (fd, 0, LOCAL_CREDS, &on, sizeof (on)) < 0) {
--			g_warning ("Unable to set LOCAL_CREDS socket option\n");
--			return FALSE;
--		}
--	}
--#endif
--	
- 	iov.iov_base = &buf;
- 	iov.iov_len = 1;
- 	
-@@ -125,7 +135,7 @@ read_unix_socket_credentials (int fd,
- 	msg.msg_iov = &iov;
- 	msg.msg_iovlen = 1;
- 	
--#ifdef HAVE_CMSGCRED
-+#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
- 	memset (cmsgmem, 0, sizeof (cmsgmem));
- 	msg.msg_control = cmsgmem;
- 	msg.msg_controllen = sizeof (cmsgmem);
-@@ -146,7 +156,7 @@ read_unix_socket_credentials (int fd,
- 		return FALSE;
- 	}
- 
--#ifdef HAVE_CMSGCRED
-+#if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
- 	if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS) {
- 		g_warning ("Message from recvmsg() was not SCM_CREDS\n");
- 		return FALSE;
-@@ -174,6 +184,14 @@ read_unix_socket_credentials (int fd,
- 		
- 		*pid = cred->cmcred_pid;
- 		*uid = cred->cmcred_euid;
-+#elif defined(LOCAL_CREDS)
-+		struct sockcred *cred;
-+		
-+		cred = (struct sockcred *) CMSG_DATA (cmsg);
-+		
-+		*pid = -1;
-+		*uid = cred->sc_euid;
-+		set_local_creds(fd, FALSE);
- #else /* !SO_PEERCRED && !HAVE_CMSGCRED */
- 		g_warning ("Socket credentials not supported on this OS\n");
- 		return FALSE;
-@@ -625,6 +643,12 @@ create_master_socket (const char **path)
- 		return FALSE;
- 	}
- 
-+        if (!set_local_creds (sock, TRUE)) {
-+		close (sock);
-+		cleanup_socket_dir ();
-+		return FALSE;
-+	}
-+
- 	g_free (tmp_tmp_dir);
- 	channel = g_io_channel_unix_new (sock);
- 	g_io_add_watch (channel, G_IO_IN | G_IO_HUP, new_client, NULL);