r1871 - in /unstable/evolution/debian: changelog patches/ patches/01_let-nss-search-for-nssckbi.patch patches/series

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sun Mar 27 13:17:08 2011
New Revision: 1871

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1871
Log:
* debian/patches:
  - 01_let-nss-search-for-nssckbi added back, it wasn't merged upstream in
    the end.                                                  closes: #616587

Added:
    unstable/evolution/debian/patches/
    unstable/evolution/debian/patches/01_let-nss-search-for-nssckbi.patch
    unstable/evolution/debian/patches/series
Modified:
    unstable/evolution/debian/changelog

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1871&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Sun Mar 27 13:17:08 2011
@@ -1,3 +1,11 @@
+evolution (2.32.2-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_let-nss-search-for-nssckbi added back, it wasn't merged upstream in
+      the end.                                                  closes: #616587
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Mar 2011 23:20:01 +0100
+
 evolution (2.32.2-1) unstable; urgency=low
 
   * New upstream release.

Added: unstable/evolution/debian/patches/01_let-nss-search-for-nssckbi.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/01_let-nss-search-for-nssckbi.patch?rev=1871&op=file
==============================================================================
--- unstable/evolution/debian/patches/01_let-nss-search-for-nssckbi.patch (added)
+++ unstable/evolution/debian/patches/01_let-nss-search-for-nssckbi.patch Sun Mar 27 13:17:08 2011
@@ -1,0 +1,47 @@
+diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
+index f8982ed..062e26c 100644
+--- a/smime/lib/e-cert-db.c
++++ b/smime/lib/e-cert-db.c
+@@ -496,37 +496,11 @@ install_loadable_roots (void)
+ 
+ 	if (!RootsModule) {
+ #ifndef G_OS_WIN32
+-		/* grovel in various places for mozilla's built-in
+-		   cert module.
+-
+-		   XXX yes this is gross.  *sigh*
+-		*/
+-		const gchar *paths_to_check[] = {
+-#ifdef MOZILLA_NSS_LIB_DIR
+-			MOZILLA_NSS_LIB_DIR,
+-#endif
+-			"/usr/lib",
+-			"/usr/lib/mozilla",
+-			"/opt/mozilla/lib",
+-			"/opt/mozilla/lib/mozilla"
+-		};
+-
+-		for (i = 0; i < G_N_ELEMENTS (paths_to_check); i++) {
+-			gchar *dll_path = g_module_build_path (paths_to_check [i], "nssckbi");
+-
+-			if (g_file_test (dll_path, G_FILE_TEST_EXISTS)) {
+-				PRInt32 modType;
+-
+-				/* Delete the existing module */
+-				SECMOD_DeleteModule ("Mozilla Root Certs", &modType);
+-
+-				SECMOD_AddNewModule("Mozilla Root Certs",dll_path, 0, 0);
+-				g_free (dll_path);
+-				break;
+-			}
+-
+-			g_free (dll_path);
+-		}
++		PRInt32 modType;
++		gchar *dll_name = g_module_build_path(NULL, "nssckbi");
++		SECMOD_DeleteModule ("Mozilla Root Certs", &modType);
++		SECMOD_AddNewModule("Mozilla Root Certs",dll_name, 0, 0);
++		g_free(dll_name);
+ #else
+ 		/* FIXME: Might be useful to look up if there is a
+ 		 * Mozilla installation on the machine and use the

Added: unstable/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/series?rev=1871&op=file
==============================================================================
--- unstable/evolution/debian/patches/series (added)
+++ unstable/evolution/debian/patches/series Sun Mar 27 13:17:08 2011
@@ -1,0 +1,1 @@
+01_let-nss-search-for-nssckbi.patch