r2139 - in /unstable/evolution-data-server/debian: changelog patches/24_save-certificates.patch patches/series

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Fri Apr  6 20:14:33 2012
New Revision: 2139

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2139
Log:
debian/patches/24_save-certificates.patch:
E-d-s is supposed to save the user's certificate in the local
certificate database and mark it as trusted or not trusted based on
the user's decision, and this change should be saved, but there was
a bug that this didn't work in certain cases.
Patch backported from upstream.

Added:
    unstable/evolution-data-server/debian/patches/24_save-certificates.patch
Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/patches/series

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2139&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Fri Apr  6 20:14:33 2012
@@ -1,3 +1,14 @@
+evolution-data-server (3.2.2-4) UNRELEASED; urgency=low
+
+  * debian/patches/24_save-certificates.patch:
+    E-d-s is supposed to save the user's certificate in the local
+    certificate database and mark it as trusted or not trusted based on
+    the user's decision, and this change should be saved, but there was
+    a bug that this didn't work in certain cases.
+    Patch backported from upstream.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 06 Apr 2012 22:09:27 +0200
+
 evolution-data-server (3.2.2-3) unstable; urgency=low
 
   * debian/patches/23_dbus_glib_threading.patch

Added: unstable/evolution-data-server/debian/patches/24_save-certificates.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/24_save-certificates.patch?rev=2139&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/24_save-certificates.patch (added)
+++ unstable/evolution-data-server/debian/patches/24_save-certificates.patch Fri Apr  6 20:14:33 2012
@@ -1,0 +1,29 @@
+Description: It is supposed to save your certificate in the local
+ certificate database and mark it as trusted or not trusted based on your
+ decision, and this change should be saved, but there was a bug that this didn't
+ work in certain cases.
+Author: Milan Crha
+Origin: https://bugzilla.gnome.org/show_bug.cgi?id=440316
+Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=666150
+Applied-Upstream: http://git.gnome.org/browse/evolution-data-server/commit/?id=287ea88b08c4fd81b49587a432e6e0d329ccdbe9
+
+Index: evolution-data-server/camel/camel-tcp-stream-ssl.c
+===================================================================
+--- evolution-data-server.orig/camel/camel-tcp-stream-ssl.c	2011-10-20 12:32:50.000000000 +0200
++++ evolution-data-server/camel/camel-tcp-stream-ssl.c	2012-04-06 22:06:28.000000000 +0200
+@@ -479,13 +479,14 @@
+ 		if (accept) {
+ 			camel_certdb_nss_cert_set (certdb, ccert, cert);
+ 			camel_cert_set_trust (certdb, ccert, CAMEL_CERT_TRUST_FULLY);
+-			camel_certdb_touch (certdb);
+ 		}
++	camel_certdb_touch (certdb);
+ 	} else {
+ 		accept = ccert->trust != CAMEL_CERT_TRUST_NEVER;
+ 	}
+ 
+ 	camel_certdb_cert_unref (certdb, ccert);
++	camel_certdb_save (certdb);
+ 	g_object_unref (certdb);
+ 
+ 	return accept ? SECSuccess : SECFailure;

Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2139&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Fri Apr  6 20:14:33 2012
@@ -10,3 +10,4 @@
 21_link_libical.patch
 22_gmodule_dep.patch
 23_dbus_glib_threading.patch
+24_save-certificates.patch