evolution/evolution-shared-nss-db.patch
Dominique Leuenberger 376a80452b Accepting request 27037 from home:dimstar:branches:GNOME:Factory
Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 27037 revision 7.
Request was accepted with message:
Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/27037
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=53
2009-12-18 08:29:59 +00:00

41 lines
1.6 KiB
Diff

Index: evolution-2.29.3.1/configure.ac
===================================================================
--- evolution-2.29.3.1.orig/configure.ac
+++ evolution-2.29.3.1/configure.ac
@@ -910,6 +910,9 @@ if test "x${enable_nss}" = "xyes" || tes
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
msg_smime="yes (Mozilla NSS)"
fi
+
+ mozilla_nss="$mozilla_nss nss-shared-helper"
+
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library])
Index: evolution-2.29.3.1/smime/lib/e-cert-db.c
===================================================================
--- evolution-2.29.3.1.orig/smime/lib/e-cert-db.c
+++ evolution-2.29.3.1/smime/lib/e-cert-db.c
@@ -73,6 +73,7 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-util-private.h"
#include <libedataserverui/e-passwords.h>
+#include <nss-shared-helper.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -166,7 +167,12 @@ initialize_nss (void)
#endif
/* we initialize NSS here to make sure it only happens once */
- success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path));
+ success = (SECSuccess == nsshelp_open_db ("evolution", evolution_dir_path, 0));
+
+ if (!success) {
+ g_warning ("Opening non-shared cert database");
+ success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path));
+ }
if (!success) {
success = (SECSuccess == NSS_Init (evolution_dir_path));
if (success)