add patch with revbump to fix segfault

(Portage version: 2.1.2_rc2-r2)

4 files changed, 65 insertions, 1 deletions

diff --git a/gnome-extra/gnome-keyring-manager/ChangeLog b/gnome-extra/gnome-keyring-manager/ChangeLog
index d47f8ddd0bef..ccc3b5ffe6fe 100644
--- a/gnome-extra/gnome-keyring-manager/ChangeLog
+++ b/gnome-extra/gnome-keyring-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-keyring-manager
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/ChangeLog,v 1.28 2006/11/19 22:13:44 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/ChangeLog,v 1.29 2006/11/28 03:09:59 compnerd Exp $
+
+*gnome-keyring-manager-2.16.0-r1 (28 Nov 2006)
+
+  28 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-keyring-manager-2.16.0-select-segfault.patch,
+  +gnome-keyring-manager-2.16.0-r1.ebuild:
+  Revbump with patch for segfault on key select
 
   19 Nov 2006; Mart Raudsepp <leio@gentoo.org>
   -gnome-keyring-manager-2.12.0.ebuild:
diff --git a/gnome-extra/gnome-keyring-manager/files/digest-gnome-keyring-manager-2.16.0-r1 b/gnome-extra/gnome-keyring-manager/files/digest-gnome-keyring-manager-2.16.0-r1
new file mode 100644
index 000000000000..3c24a5a5531a
--- /dev/null
+++ b/gnome-extra/gnome-keyring-manager/files/digest-gnome-keyring-manager-2.16.0-r1
@@ -0,0 +1,3 @@
+MD5 d63bfa5e9cfe334694438a74c157344c gnome-keyring-manager-2.16.0.tar.bz2 454066
+RMD160 30592dc2369e62e1248387a3cf25a673feb3a35a gnome-keyring-manager-2.16.0.tar.bz2 454066
+SHA256 23f0449af7cba89f4ae26c8e67f1d09bc45389f9dcd7349d2e6540620571051c gnome-keyring-manager-2.16.0.tar.bz2 454066
diff --git a/gnome-extra/gnome-keyring-manager/files/gnome-keyring-manager-2.16.0-select-segfault.patch b/gnome-extra/gnome-keyring-manager/files/gnome-keyring-manager-2.16.0-select-segfault.patch
new file mode 100644
index 000000000000..a274ed3edb8a
--- /dev/null
+++ b/gnome-extra/gnome-keyring-manager/files/gnome-keyring-manager-2.16.0-select-segfault.patch
@@ -0,0 +1,16 @@
+Index: src/gnome-keyring-manager-acl-display.c
+===================================================================
+RCS file: /cvs/gnome/gnome-keyring-manager/src/gnome-keyring-manager-acl-display.c,v
+retrieving revision 1.3
+diff -u -p -d -r1.3 gnome-keyring-manager-acl-display.c
+--- src/gnome-keyring-manager-acl-display.c	3 Apr 2006 21:16:09 -0000	1.3
++++ src/gnome-keyring-manager-acl-display.c	5 Oct 2006 17:09:59 -0000
+@@ -402,7 +402,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 (app_path && g_str_equal (path, app_path))
++      if (app_path && path && g_str_equal (path, app_path))
+ 	{
+ 	  self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
+ 	}
diff --git a/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.16.0-r1.ebuild b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.16.0-r1.ebuild
new file mode 100644
index 000000000000..db6b487e7f82
--- /dev/null
+++ b/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.16.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-keyring-manager/gnome-keyring-manager-2.16.0-r1.ebuild,v 1.1 2006/11/28 03:09:59 compnerd Exp $
+
+inherit gnome2
+
+DESCRIPTION="A keyring management program for the GNOME Desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-keyring-0.3.2
+	>=gnome-base/gconf-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.28
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.8
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable static) --disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.16.0-select-segfault.patch
+}