r2146 - in /experimental/evolution/debian: changelog patches/01_nss_paths.patch patches/series

[jordi at users.alioth.debian.org]

Author: jordi
Date: Wed May  2 17:31:05 2012
New Revision: 2146

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2146
Log:
debian/patches/01_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:
    experimental/evolution/debian/patches/01_nss_paths.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/patches/series

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2146&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Wed May  2 17:31:05 2012
@@ -22,8 +22,11 @@
   * Add --list-missing to dh_install invocation.
   * Drop all cherrypicked packages (all but 04_gettext_intltool.patch),
     all are obsolete in 3.4.
-
- -- Jordi Mallach <jordi at debian.org>  Wed, 02 May 2012 17:14:42 +0200
+  * debian/patches/01_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:27:43 +0200
 
 evolution (3.2.2-1) unstable; urgency=low
 

Added: experimental/evolution/debian/patches/01_nss_paths.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/01_nss_paths.patch?rev=2146&op=file
==============================================================================
--- experimental/evolution/debian/patches/01_nss_paths.patch (added)
+++ experimental/evolution/debian/patches/01_nss_paths.patch Wed May  2 17:31:05 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=""

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2146&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series (original)
+++ experimental/evolution/debian/patches/series Wed May  2 17:31:05 2012
@@ -1,1 +1,2 @@
+01_nss_paths.patch
 04_gettext_intltool.patch