r1481 - in /unstable/evolution/debian: changelog patches/02_let-nss-search-for-nssckbi.patch
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Tue Jan 12 20:37:21 UTC 2010
Author: corsac
Date: Tue Jan 12 20:37:20 2010
New Revision: 1481
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1481
Log:
* debian/patches:
- 02_let-nss-search-for-nssckbi added, fix nss modules lookup, should fix
certificate verification in evolution. closes: #563253
Added:
unstable/evolution/debian/patches/02_let-nss-search-for-nssckbi.patch
Modified:
unstable/evolution/debian/changelog
Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1481&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Jan 12 20:37:20 2010
@@ -8,8 +8,11 @@
- Try to really remove spurious spaces in debconf templates and unfuzzy
translations. closes: #548510
- add pt_BR.po, thanks Fábio Ferreira. closes: #563034
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 02 Jan 2010 22:55:00 +0100
+ * debian/patches:
+ - 02_let-nss-search-for-nssckbi added, fix nss modules lookup, should fix
+ certificate verification in evolution. closes: #563253
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Jan 2010 08:37:00 +0100
evolution (2.28.2-1) unstable; urgency=low
Added: unstable/evolution/debian/patches/02_let-nss-search-for-nssckbi.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/02_let-nss-search-for-nssckbi.patch?rev=1481&op=file
==============================================================================
--- unstable/evolution/debian/patches/02_let-nss-search-for-nssckbi.patch (added)
+++ unstable/evolution/debian/patches/02_let-nss-search-for-nssckbi.patch Tue Jan 12 20:37:20 2010
@@ -1,0 +1,45 @@
+--- evolution-2.28.2.orig/smime/lib/e-cert-db.c
++++ evolution-2.28.2/smime/lib/e-cert-db.c
+@@ -254,37 +254,11 @@
+
+ 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
More information about the pkg-evolution-commits
mailing list