r2147 - in /unstable/evolution/debian: changelog patches/02_nss_paths.patch

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed May  2 17:35:27 2012
New Revision: 2147

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2147
Log:
02_nss_paths.patch: Fix the NSS libdir to add a "/nss". This should
fix evolution not finding any root CA certificates. Thanks to Mathieu
Trudel-Lapierre (closes: #658780).

Added:
    unstable/evolution/debian/patches/02_nss_paths.patch
Modified:
    unstable/evolution/debian/changelog

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2147&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Wed May  2 17:35:27 2012
@@ -1,4 +1,4 @@
-evolution (3.2.2-2) UNRELEASED; urgency=low
+evolution (3.2.2-2) unstable; urgency=low
 
   [ Debconf translations ]
   * Dutch; (Jeroen Schot).  Closes: #626354
@@ -14,7 +14,12 @@
   * debian/control corrected evolution homepage to
     http://projects.gnome.org/evolution/
 
- -- Noël Köthe <noel at debian.org>  Thu, 05 Apr 2012 15:21:07 +0200
+  [ Jordi Mallach ]
+  * 02_nss_paths.patch: Fix the NSS libdir to add a "/nss". This should
+    fix evolution not finding any root CA certificates. Thanks to Mathieu
+    Trudel-Lapierre (closes: #658780).
+
+ -- Jordi Mallach <jordi at debian.org>  Wed, 02 May 2012 19:35:17 +0200
 
 evolution (3.2.2-1) unstable; urgency=low
 

Added: unstable/evolution/debian/patches/02_nss_paths.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/02_nss_paths.patch?rev=2147&op=file
==============================================================================
--- unstable/evolution/debian/patches/02_nss_paths.patch (added)
+++ unstable/evolution/debian/patches/02_nss_paths.patch Wed May  2 17:35:27 2012
@@ -1,0 +1,19 @@
+Author: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre at canonical.com>
+Description: Fix the NSS libdir to add a "/nss"
+ That variable is only used to point to the directory in which nssckbi (the
+ built-in certificate store of NSS) lives, and it's actually under libdir/nss
+ rather than directly under libdir.
+
+Index: evolution-3.2.2/configure.ac
+===================================================================
+--- evolution-3.2.2.orig/configure.ac	2012-01-04 10:31:04.819896725 -0500
++++ evolution-3.2.2/configure.ac	2012-01-04 10:32:35.639899977 -0500
+@@ -824,7 +824,7 @@
+ 			fi
+ 			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])
++			AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`/nss",[Define to the full path of mozilla nss library])
+ 			MANUAL_NSPR_CFLAGS=""
+ 			MANUAL_NSPR_LIBS=""
+ 			MANUAL_NSS_CFLAGS=""