diff -Nru gnome-settings-daemon-3.4.2/debian/changelog gnome-settings-daemon-3.4.2/debian/changelog --- gnome-settings-daemon-3.4.2/debian/changelog 2012-11-16 22:27:31.000000000 +0530 +++ gnome-settings-daemon-3.4.2/debian/changelog 2013-01-10 17:26:40.000000000 +0530 @@ -1,3 +1,11 @@ +gnome-settings-daemon (3.4.2-0ubuntu0.7) precise; urgency=low + + * debian/patches/git-smartcard-crash.patch: + - gnome-settings-daemon segfaults when using smartcard authentication + (lp: #1031034) + + -- Ritesh Khadgaray Thu, 10 Jan 2013 17:23:56 +0530 + gnome-settings-daemon (3.4.2-0ubuntu0.6) precise-proposed; urgency=low * debian/patches/git_no_numlock_eating_cpu_loop.patch: diff -Nru gnome-settings-daemon-3.4.2/debian/patches/git-smartcard-crash.patch gnome-settings-daemon-3.4.2/debian/patches/git-smartcard-crash.patch --- gnome-settings-daemon-3.4.2/debian/patches/git-smartcard-crash.patch 1970-01-01 05:30:00.000000000 +0530 +++ gnome-settings-daemon-3.4.2/debian/patches/git-smartcard-crash.patch 2013-01-10 17:23:20.000000000 +0530 @@ -0,0 +1,38 @@ +From fdfd97cd737257532c8797e2a551a10f5c74cf05 Mon Sep 17 00:00:00 2001 +From: Michael Terry +Date: Tue, 31 Jul 2012 11:54:51 -0400 +Subject: [PATCH] [smartcard] Don't try to use smartcard drivers that didn't + load + +https://bugzilla.gnome.org/show_bug.cgi?id=668950 +--- + plugins/smartcard/gsd-smartcard-manager.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: gnome-settings-daemon-3.4.2/plugins/smartcard/gsd-smartcard-manager.c +=================================================================== +--- gnome-settings-daemon-3.4.2.orig/plugins/smartcard/gsd-smartcard-manager.c 2012-04-12 05:54:01.000000000 -0400 ++++ gnome-settings-daemon-3.4.2/plugins/smartcard/gsd-smartcard-manager.c 2012-07-31 12:06:17.612835667 -0400 +@@ -731,8 +731,8 @@ + g_free (module_spec); + module_spec = NULL; + +- if (!SECMOD_HasRemovableSlots (module) || +- !module->loaded) { ++ if (SECMOD_HasRemovableSlots (module) && ++ module->loaded) { + modules = g_list_prepend (modules, module); + } else { + g_debug ("fallback module found but not %s", +@@ -767,8 +767,8 @@ + g_free (module_spec); + module_spec = NULL; + +- if (!SECMOD_HasRemovableSlots (module) || +- !module->loaded) { ++ if (SECMOD_HasRemovableSlots (module) && ++ module->loaded) { + modules = g_list_prepend (modules, module); + } else { + g_debug ("fallback module found but not loaded"); + diff -Nru gnome-settings-daemon-3.4.2/debian/patches/series gnome-settings-daemon-3.4.2/debian/patches/series --- gnome-settings-daemon-3.4.2/debian/patches/series 2012-11-16 22:27:31.000000000 +0530 +++ gnome-settings-daemon-3.4.2/debian/patches/series 2013-01-10 17:23:40.000000000 +0530 @@ -31,3 +31,4 @@ git-mask-out-virtual-modifiers.patch dont_overwrite_gconf_keys.patch git_no_numlock_eating_cpu_loop.patch +git-smartcard-crash.patch