rpms/gnome-keyring/F-12 gnome-keyring-2.28.1-nopass.patch, NONE, 1.1 gnome-keyring.spec, 1.134, 1.135

[Ray Strode]

Author: rstrode

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

Modified Files:
	gnome-keyring.spec 
Added Files:
	gnome-keyring-2.28.1-nopass.patch 
Log Message:
- Don't start keyring daemon if pam password is empty
  Patch from Dan Walsh. (bug 529709)


gnome-keyring-2.28.1-nopass.patch:
 gkr-pam-module.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gnome-keyring-2.28.1-nopass.patch ---
diff -up gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass gnome-keyring-2.28.1/pam/gkr-pam-module.c
--- gnome-keyring-2.28.1/pam/gkr-pam-module.c.nopass	2009-09-25 21:55:50.000000000 -0400
+++ gnome-keyring-2.28.1/pam/gkr-pam-module.c	2009-10-19 11:27:34.000000000 -0400
@@ -878,6 +878,7 @@ pam_sm_authenticate (pam_handle_t *ph, i
 
 	started_daemon = 0;
 
+
 	/* Should we start the daemon? */
 	if (args & ARG_AUTO_START) {
 		ret = start_daemon_if_necessary (ph, pwd, password, &started_daemon);
@@ -944,8 +945,9 @@ pam_sm_open_session (pam_handle_t *ph, i
 		 * different PAM callbacks from different processes.
 		 * 
 		 * No use complaining
+		 * Do not start gnome-keyring, dbus will start it on login.
 		 */
-		password = NULL;
+		return PAM_SUCCESS;
 	}
 	
 	started_daemon = 0;


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/F-12/gnome-keyring.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- gnome-keyring.spec	19 Oct 2009 09:38:54 -0000	1.134
+++ gnome-keyring.spec	19 Oct 2009 16:14:11 -0000	1.135
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
@@ -16,6 +16,10 @@ Source: http://download.gnome.org/source
 # https://bugzilla.gnome.org/show_bug.cgi?id=598494
 Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
 
+# http://bugzilla.redhat.com/529709
+# http://bugs.gnome.org/598494
+Patch3: gnome-keyring-2.28.1-nopass.patch
+
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,6 +73,7 @@ automatically unlock the "login" keyring
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch2 -p1 -b .die-on-session-exit
+%patch3 -p1 -b .no-pass
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -146,6 +151,10 @@ fi
 
 
 %changelog
+* Mon Oct 19 2009 Ray Strode <rstrode at redhat.com> 2.28.1-2
+- Don't start keyring daemon if pam password is empty
+  Patch from Dan Walsh. (bug 529709)
+
 * Mon Oct 19 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
 - Update to 2.28.1