r1722 - in /unstable/evolution/debian: changelog patches/03_correctly-init-nss.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sun Sep 12 18:02:05 2010
New Revision: 1722

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1722
Log:
* debian/patches:
  - 03_correctly-init-nss added, fix nss initialisation by login to NSS
    database before invoking certificate manager.

Added:
    unstable/evolution/debian/patches/03_correctly-init-nss.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/patches/series

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1722&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sun Sep 12 18:02:05 2010
@@ -1,3 +1,11 @@
+evolution (2.30.3-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 03_correctly-init-nss added, fix nss initialisation by login to NSS
+      database before invoking certificate manager.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 12 Sep 2010 20:00:59 +0200
+
 evolution (2.30.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: unstable/evolution/debian/patches/03_correctly-init-nss.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/03_correctly-init-nss.patch?rev=1722&op=file
==============================================================================
--- unstable/evolution/debian/patches/03_correctly-init-nss.patch (added)
+++ unstable/evolution/debian/patches/03_correctly-init-nss.patch Sun Sep 12 18:02:05 2010
@@ -1,0 +1,27 @@
+commit 96f4d86c98c801a4510c17b948609af76ffb6061
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Sun Sep 12 16:59:41 2010 +0100
+
+    Bug 626066 - log in to NSS database before invoking certificate manager
+
+diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
+index d76b743..f0c68f2 100644
+--- a/smime/gui/certificate-manager.c
++++ b/smime/gui/certificate-manager.c
+@@ -1000,11 +1000,15 @@ certificate_manager_config_init (EShell *shell)
+ 	CertificateManagerData *cfm_data;
+ 	GtkWidget *preferences_window;
+ 	GtkWidget *widget;
++	PK11SlotInfo* slot;
++	ECertDB *cert_db;
+ 
+ 	g_return_if_fail (E_IS_SHELL (shell));
+ 
+ 	/* We need to peek the db here to make sure it (and NSS) are fully initialized. */
+-	e_cert_db_peek ();
++	cert_db = e_cert_db_peek();
++	slot = PK11_GetInternalKeySlot();
++	e_cert_db_login_to_slot(cert_db, slot);
+ 
+ 	cfm_data = g_new0 (CertificateManagerData, 1);
+ 

Modified: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1722&op=diff
==============================================================================
--- unstable/evolution/debian/patches/series (original)
+++ unstable/evolution/debian/patches/series Sun Sep 12 18:02:05 2010
@@ -1,1 +1,2 @@
 02_let-nss-search-for-nssckbi.patch
+03_correctly-init-nss.patch