callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* debian/patches:

Browse Source 
- 02_let-nss-search-for-nssckbi added, fix nss modules lookup, should fix
    certificate verification in evolution.                    closes: #563253

git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1481 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Yves-Alexis Perez
2010-01-12 20:37:20 +00:00
parent b8b4094784
commit 8a4bc8fb47
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -8,8 +8,11 @@ evolution (2.28.2-2) UNRELEASED; urgency=low
- Try to really remove spurious spaces in debconf templates and unfuzzy
translations. closes: #548510
- add pt_BR.po, thanks Fábio Ferreira. closes: #563034
* 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@debian.org> Sat, 02 Jan 2010 22:55:00 +0100
-- Yves-Alexis Perez <corsac@debian.org> Tue, 12 Jan 2010 08:37:00 +0100
evolution (2.28.2-1) unstable; urgency=low

45
debian/patches/02_let-nss-search-for-nssckbi.patch vendored Normal file
View File

@ -0,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