diff options
| author | jmmv <jmmv@pkgsrc.org> | 2006-08-28 09:03:40 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2006-08-28 09:03:40 +0000 |
| commit | 597b5c7ed3116d9c3583a150193d99da6d396b6a (patch) | |
| tree | 889931f57fdd9b6006b02a0c8a747ac587860444 /security | |
| parent | 63aa199ee50f8342225a56538a5313e9fd40f8a3 (diff) | |
| download | pkgsrc-597b5c7ed3116d9c3583a150193d99da6d396b6a.tar.gz | |
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 (limited to 'security')
| -rw-r--r-- | security/gnome-keyring-manager/Makefile | 4 | ||||
| -rw-r--r-- | security/gnome-keyring-manager/distinfo | 3 | ||||
| -rw-r--r-- | security/gnome-keyring-manager/patches/patch-aa | 22 |
3 files changed, 26 insertions, 3 deletions
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile index f06f7e0ee59..1c04ca9ae78 100644 --- a/security/gnome-keyring-manager/Makefile +++ b/security/gnome-keyring-manager/Makefile @@ -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 --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo index ebffb53a9ad..ff9fbd86e88 100644 --- a/security/gnome-keyring-manager/distinfo +++ b/security/gnome-keyring-manager/distinfo @@ -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 --git a/security/gnome-keyring-manager/patches/patch-aa b/security/gnome-keyring-manager/patches/patch-aa new file mode 100644 index 00000000000..2fb4c26d3ce --- /dev/null +++ b/security/gnome-keyring-manager/patches/patch-aa @@ -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), |