rpms/gdm/devel gdm-2.16.0-security-tokens.patch, 1.4, 1.5 gdm.spec, 1.198, 1.199

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21919

Modified Files:
	gdm-2.16.0-security-tokens.patch gdm.spec 
Log Message:
- fix a problem recently introduced in the smart card driver
  loading code (bug 206882)


gdm-2.16.0-security-tokens.patch:
 config/Makefile.am            |   31 
 config/gdm.conf.in            |    4 
 config/securitytokens.conf.in |    3 
 configure.ac                  |    3 
 daemon/Makefile.am            |    7 
 daemon/gdm.c                  |   93 ++
 daemon/securitytoken.c        |  580 +++++++++++++++
 daemon/securitytoken.h        |   91 ++
 daemon/securitytokenmonitor.c | 1617 ++++++++++++++++++++++++++++++++++++++++++
 daemon/securitytokenmonitor.h |   84 ++
 10 files changed, 2508 insertions(+), 5 deletions(-)

Index: gdm-2.16.0-security-tokens.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.16.0-security-tokens.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.16.0-security-tokens.patch	15 Sep 2006 21:52:41 -0000	1.4
+++ gdm-2.16.0-security-tokens.patch	18 Sep 2006 17:36:39 -0000	1.5
@@ -1,4 +1,4 @@
---- /dev/null	2006-09-15 14:34:25.793453720 -0400
+--- /dev/null	2006-09-18 09:23:19.303978694 -0400
 +++ gdm-2.16.0/config/securitytokens.conf.in	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,3 @@
 +[SecurityTokens]
@@ -99,9 +99,9 @@
  AC_SUBST(DAEMON_CFLAGS)
  AC_SUBST(DAEMON_LIBS)
  
---- /dev/null	2006-09-15 14:34:25.793453720 -0400
-+++ gdm-2.16.0/daemon/securitytokenmonitor.c	2006-09-15 17:51:55.000000000 -0400
-@@ -0,0 +1,1614 @@
+--- /dev/null	2006-09-18 09:23:19.303978694 -0400
++++ gdm-2.16.0/daemon/securitytokenmonitor.c	2006-09-18 13:35:13.000000000 -0400
+@@ -0,0 +1,1617 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
 + * 
@@ -467,6 +467,7 @@
 +						 ScSecurityTokenMonitorPrivate);
 +    monitor->priv->poll_timeout_id = 0;
 +    monitor->priv->is_unstoppable = FALSE;
++    monitor->priv->module = NULL;
 +
 +    monitor->priv->security_tokens = 
 +	    g_hash_table_new_full ((GHashFunc) sc_slot_id_hash, 
@@ -842,6 +843,7 @@
 +
 +    sc_debug ("attempting to load driver...");
 +
++    module = NULL;
 +    module_explicitly_specified = module_path != NULL;
 +    if (module_explicitly_specified) {
 +	    module_spec = g_strdup_printf ("library=\"%s\"", module_path);
@@ -1241,6 +1243,7 @@
 +
 +    worker = g_slice_new0 (ScSecurityTokenMonitorWorker);
 +    worker->output_fd = output_fd;
++    worker->module = NULL;
 +
 +    worker->security_tokens =
 +	    g_hash_table_new_full ((GHashFunc) sc_slot_id_hash, 
@@ -1716,7 +1719,7 @@
 +    return 0;
 +}
 +#endif
---- /dev/null	2006-09-15 14:34:25.793453720 -0400
+--- /dev/null	2006-09-18 09:23:19.303978694 -0400
 +++ gdm-2.16.0/daemon/securitytoken.h	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,91 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
@@ -1810,7 +1813,7 @@
 +
 +G_END_DECLS
 +#endif				/* SC_SECURITY_TOKEN_H */
---- /dev/null	2006-09-15 14:34:25.793453720 -0400
+--- /dev/null	2006-09-18 09:23:19.303978694 -0400
 +++ gdm-2.16.0/daemon/securitytoken.c	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,580 @@
 +/* securitytoken.c - security token
@@ -2558,7 +2561,7 @@
 +    ve_config_destroy (cfg);
 +}
  /* EOF */
---- /dev/null	2006-09-15 14:34:25.793453720 -0400
+--- /dev/null	2006-09-18 09:23:19.303978694 -0400
 +++ gdm-2.16.0/daemon/securitytokenmonitor.h	2006-09-15 17:50:02.000000000 -0400
 @@ -0,0 +1,84 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- gdm.spec	15 Sep 2006 21:03:00 -0000	1.198
+++ gdm.spec	18 Sep 2006 17:36:40 -0000	1.199
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.16.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -301,6 +301,10 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Mon Sep 18 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-6.fc6
+- fix a problem recently introduced in the smart card driver
+  loading code (bug 206882)
+
 * Thu Sep 14 2006 Ray Strode <rstrode at redhat.com> - 1:2.16.0-5.fc6
 - don't leak pipe fds (bug 206709)