rpms/gnome-keyring/F-12 gnome-keyring-2.28.0-die-on-session-exit.patch, NONE, 1.1 gnome-keyring.spec, 1.132, 1.133

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-keyring/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30994

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.28.0-die-on-session-exit.patch 
Log Message:
- Die on ctrl-alt-backspace and other abrupt exits


gnome-keyring-2.28.0-die-on-session-exit.patch:
 gkr-daemon-dbus.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE gnome-keyring-2.28.0-die-on-session-exit.patch ---
diff -up gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c
--- gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c.die-on-session-exit	2009-10-14 17:18:03.396005149 -0400
+++ gnome-keyring-2.28.0/daemon/gkr-daemon-dbus.c	2009-10-14 17:15:03.498984754 -0400
@@ -145,8 +145,12 @@ signal_filter (DBusConnection *conn, DBu
 		unregister_daemon_in_session ();
 		gkr_daemon_quit ();
 		return DBUS_HANDLER_RESULT_HANDLED;
+	} else if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+		unregister_daemon_in_session ();
+		gkr_daemon_quit ();
+		return DBUS_HANDLER_RESULT_HANDLED;
 	}
-	
+
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- gnome-keyring.spec	9 Oct 2009 01:44:19 -0000	1.132
+++ gnome-keyring.spec	14 Oct 2009 21:30:30 -0000	1.133
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -19,6 +19,9 @@ Patch0: gnome-keyring-no-logout-delay.pa
 # fixed upstream: https://bugzilla.gnome.org/show_bug.cgi?id=597813
 Patch1: rsa1-keys.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=598494
+Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,6 +76,7 @@ automatically unlock the "login" keyring
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .logout-delay
 %patch1 -p1 -b .rsa1-keys
+%patch2 -p1 -b .die-on-session-exit
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -150,6 +154,9 @@ fi
 
 
 %changelog
+* Wed Oct 14 2009 Ray Strode <rstrode at redhat.com> - 2.28.0-4
+- Die on ctrl-alt-backspace and other abrupt exits
+
 * Thu Oct  8 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-3
 - Fix handling of rsa1 keys