r1685 - in /unstable/evolution-data-server/debian: changelog control patches/01_make-nss-db-init-more-robust.patch patches/02_remove-courier-imap-workaround-breaking-rename.patch patches/series rules

corsac at users.alioth.debian.org corsac at users.alioth.debian.org
Sat Jul 3 14:15:31 UTC 2010 

Author: corsac
Date: Sat Jul  3 14:15:09 2010
New Revision: 1685

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1685
Log:
* debian/patches:
  - 01_make-nss-db-init-more-robust added.                    closes: #587849
  - 02_remove-courier-imap-workaround-breaking-rename added, fix renaming on
    courier-imap servers.
* debian/rules:
  - rename --enable-nss to -enable-ssl in configure call.
  - DEB_FIXPERMS_EXCLUDE switched to _evolution-data-server.
* debian/control:
  - update standards version to 3.9.0.

Added:
    unstable/evolution-data-server/debian/patches/01_make-nss-db-init-more-robust.patch
    unstable/evolution-data-server/debian/patches/02_remove-courier-imap-workaround-breaking-rename.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/patches/series
    unstable/evolution-data-server/debian/rules

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1685&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sat Jul  3 14:15:09 2010
@@ -1,3 +1,17 @@
+evolution-data-server (2.30.2-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_make-nss-db-init-more-robust added.                    closes: #587849
+    - 02_remove-courier-imap-workaround-breaking-rename added, fix renaming on
+      courier-imap servers.
+  * debian/rules:
+    - rename --enable-nss to -enable-ssl in configure call.
+    - DEB_FIXPERMS_EXCLUDE switched to _evolution-data-server.
+  * debian/control:
+    - update standards version to 3.9.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 03 Jul 2010 12:42:41 +0200
+
 evolution-data-server (2.30.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1685&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sat Jul  3 14:15:09 2010
@@ -12,7 +12,7 @@
            Pedro Fragoso <ember at ubuntu.com>,
            Josselin Mouette <joss at debian.org>,
            David Weinehall <tao at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-data-server

Added: unstable/evolution-data-server/debian/patches/01_make-nss-db-init-more-robust.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_make-nss-db-init-more-robust.patch?rev=1685&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_make-nss-db-init-more-robust.patch (added)
+++ unstable/evolution-data-server/debian/patches/01_make-nss-db-init-more-robust.patch Sat Jul  3 14:15:09 2010
@@ -1,0 +1,74 @@
+commit 1ca0f0d2db265fcded9c74954d3651e1ba2b40b1
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Fri Jul 2 10:58:11 2010 +0100
+
+    Make NSS database initialisation more robust, handle errors better
+    
+    Since commit 9116943e we only attempt to open the new SQL database, but
+    some users are reporting issues. Be more careful about reporting errors
+    when that happens, and also fall back to the old DBM database if the SQL
+    database fails to initialise.
+    (cherry picked from commit fe84f63ac7b0eb51356451e5aafe02e27a03d4e4)
+
+diff --git a/camel/camel.c b/camel/camel.c
+index de3885f..f53bb7a 100644
+--- a/camel/camel.c
++++ b/camel/camel.c
+@@ -32,6 +32,7 @@
+ #include <prthread.h>
+ #include "nss.h"      /* Don't use <> here or it will include the system nss.h instead */
+ #include <ssl.h>
++#include <errno.h>
+ #endif /* HAVE_NSS */
+ 
+ #include <glib.h>
+@@ -104,7 +105,7 @@ camel_init (const gchar *configdir, gboolean nss_init)
+ 	if (nss_init) {
+ 		gchar *nss_configdir = NULL;
+ 		gchar *nss_sql_configdir = NULL;
+-		SECStatus status;
++		SECStatus status = SECFailure;
+ 		PRUint16 indx;
+ 
+ 		if (nss_initlock == NULL) {
+@@ -138,7 +139,9 @@ camel_init (const gchar *configdir, gboolean nss_init)
+ #else
+ 			gchar *user_nss_dir = g_build_filename ( g_get_home_dir (),
+ 								 ".pki/nssdb", NULL );
+-			g_mkdir_with_parents (user_nss_dir, 0700);
++			if (g_mkdir_with_parents (user_nss_dir, 0700))
++				g_warning("Failed to create SQL database directory %s: %s\n",
++					  user_nss_dir, strerror(errno));
+ 
+ 			nss_sql_configdir = g_strconcat ("sql:", user_nss_dir, NULL);
+ 			g_free(user_nss_dir);
+@@ -160,15 +163,14 @@ camel_init (const gchar *configdir, gboolean nss_init)
+ 			0);			/* flags */
+ 
+ 		if (status == SECFailure) {
+-			g_free (nss_configdir);
+-			g_free (nss_sql_configdir);
+-			g_warning ("Failed to initialize NSS");
+-			PR_Unlock (nss_initlock);
+-			return -1;
++			g_warning ("Failed to initialize NSS SQL database in %s: NSS error %d",
++				   nss_sql_configdir, PORT_GetError());
++			/* Fall back to opening the old DBM database */
+ 		}
+-#else
++#endif
+ 		/* Support old versions of libnss, pre-sqlite support. */
+-		status = NSS_InitReadWrite (nss_configdir);
++		if (status == SECFailure)
++			status = NSS_InitReadWrite (nss_configdir);
+ 		if (status == SECFailure) {
+ 			/* Fall back to using volatile dbs? */
+ 			status = NSS_NoDB_Init (nss_configdir);
+@@ -180,7 +182,6 @@ camel_init (const gchar *configdir, gboolean nss_init)
+ 				return -1;
+ 			}
+ 		}
+-#endif
+ 
+ 		nss_initialized = TRUE;
+ skip_nss_init:

Added: unstable/evolution-data-server/debian/patches/02_remove-courier-imap-workaround-breaking-rename.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/02_remove-courier-imap-workaround-breaking-rename.patch?rev=1685&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/02_remove-courier-imap-workaround-breaking-rename.patch (added)
+++ unstable/evolution-data-server/debian/patches/02_remove-courier-imap-workaround-breaking-rename.patch Sat Jul  3 14:15:09 2010
@@ -1,0 +1,33 @@
+commit f9cef2566ba5e2fc0732256eb726017a8820ca77
+Author: David Woodhouse <David.Woodhouse at intel.com>
+Date:   Thu Jun 24 15:41:30 2010 +0100
+
+    Remove courier-imap rename workaround
+    
+    This is breaking things on non-buggy servers, because after renaming the
+    folder in question we also attempt to rename all its subfolders... and
+    quite reasonably get a failure.
+    
+    Testing against current versions of Courier (4.4.0) seems to suggest
+    that it's not actually necessary, either -- perhaps the bug has been
+    fixed in the 9 years since this hack was first added to the imap back
+    end in commit bfce883e.
+    (cherry picked from commit 4083bbc36154ea91b203d7b672df5584978dfb10)
+
+diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
+index 72ec38a..7556773 100644
+--- a/camel/providers/imapx/camel-imapx-store.c
++++ b/camel/providers/imapx/camel-imapx-store.c
+@@ -650,12 +650,6 @@ rename_folder_info (CamelIMAPXStore *istore, const gchar *old_name, const gchar
+ 				npath = g_strdup(new_name);
+ 			nfull = camel_imapx_store_summary_path_to_full(istore->summary, npath, istore->dir_sep);
+ 
+-			/* workaround for broken server (courier uses '.') that doesn't rename
+-			   subordinate folders as required by rfc 2060 */
+-			if (istore->dir_sep == '.') {
+-				camel_imapx_server_rename_folder (istore->server, path, nfull, ex);
+-			}
+-
+ 			camel_store_info_set_string((CamelStoreSummary *)istore->summary, si, CAMEL_STORE_INFO_PATH, npath);
+ 			camel_store_info_set_string((CamelStoreSummary *)istore->summary, si, CAMEL_IMAPX_STORE_INFO_FULL_NAME, nfull);
+ 

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=1685&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Sat Jul  3 14:15:09 2010
@@ -1,3 +1,5 @@
+01_make-nss-db-init-more-robust.patch
+02_remove-courier-imap-workaround-breaking-rename.patch
 25_mute-debug-messages.patch
 45_libcamel_providers_version.patch
 65_evolution-color.patch

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1685&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Sat Jul  3 14:15:09 2010
@@ -18,7 +18,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \
 	--enable-ipv6 \
-	--enable-nss \
+	--enable-ssl \
 	--enable-nntp \
 	--enable-smime \
 	--with-openldap \
@@ -28,7 +28,7 @@
 	--enable-gnome-keyring=yes \
 	--enable-largefile
 
-DEB_FIXPERMS_EXCLUDE += usr/lib/evolution/camel-lock-helper*
+DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 
 binary-install/evolution-data-server::
 	chgrp mail $(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel-lock-helper*

More information about the pkg-evolution-commits mailing list