[pkgsrc/trunk]: pkgsrc/security/gnome-keyring-manager gnome-keyring cannot cu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b375b244b63
branches:  trunk
changeset: 517989:0b375b244b63
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Mon Aug 28 09:03:40 2006 +0000

description:
gnome-keyring cannot currently provide applications' paths under NetBSD so
be sure not to use them (NULL pointers) when showing information to the user.
Fixes crashes when clicking on saved keyring items.

Bump PKGREVISION to 2.

diffstat:

 security/gnome-keyring-manager/Makefile         |   4 ++--
 security/gnome-keyring-manager/distinfo         |   3 ++-
 security/gnome-keyring-manager/patches/patch-aa |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 3d52f76c076c -r 0b375b244b63 security/gnome-keyring-manager/Makefile
--- a/security/gnome-keyring-manager/Makefile   Mon Aug 28 08:31:34 2006 +0000
+++ b/security/gnome-keyring-manager/Makefile   Mon Aug 28 09:03:40 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/07/05 05:37:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/08/28 09:03:40 jmmv Exp $
 #
 
 DISTNAME=      gnome-keyring-manager-2.14.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.14/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 3d52f76c076c -r 0b375b244b63 security/gnome-keyring-manager/distinfo
--- a/security/gnome-keyring-manager/distinfo   Mon Aug 28 08:31:34 2006 +0000
+++ b/security/gnome-keyring-manager/distinfo   Mon Aug 28 09:03:40 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/01 18:18:32 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2006/08/28 09:03:40 jmmv Exp $
 
 SHA1 (gnome-keyring-manager-2.14.0.tar.bz2) = 71e25d2184351954b9d8821b98ade8828d5259bf
 RMD160 (gnome-keyring-manager-2.14.0.tar.bz2) = 799ff976f816ac4aa1339280c0bac8f38e141307
 Size (gnome-keyring-manager-2.14.0.tar.bz2) = 391387 bytes
+SHA1 (patch-aa) = 9e944fc2100ed493447daacd739a5efe3d7f3c97
diff -r 3d52f76c076c -r 0b375b244b63 security/gnome-keyring-manager/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnome-keyring-manager/patches/patch-aa   Mon Aug 28 09:03:40 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2006/08/28 09:03:40 jmmv Exp $
+
+--- src/gnome-keyring-manager-acl-display.c.orig       2005-04-24 20:40:43.000000000 +0200
++++ src/gnome-keyring-manager-acl-display.c
+@@ -399,7 +399,7 @@ gkm_acl_display_set_acl (GKMAclDisplay *
+       path = gnome_keyring_item_ac_get_path_name (ac);
+ 
+       /* We don't want to include ourself in the list. */
+-      if (g_str_equal (path, gkm_get_application_path ()))
++      if (path != NULL && g_str_equal (path, gkm_get_application_path ()))
+       {
+         self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
+       }
+@@ -410,7 +410,7 @@ gkm_acl_display_set_acl (GKMAclDisplay *
+         gtk_list_store_append (self->priv->acl_store, &iter);
+         gtk_list_store_set (self->priv->acl_store, &iter, 
+                             AC_COLUMN_NAME, name,
+-                            AC_COLUMN_PATH, path,
++                            AC_COLUMN_PATH, path == NULL ? "Unavailable" : path,
+                             AC_COLUMN_READ, (at & GNOME_KEYRING_ACCESS_READ),
+                             AC_COLUMN_WRITE, (at & GNOME_KEYRING_ACCESS_WRITE),
+                             AC_COLUMN_DELETE, (at & GNOME_KEYRING_ACCESS_REMOVE),