r1321 - in /experimental/evolution-data-server/debian: changelog patches/66_re-enable-gpg-agent.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Wed Aug 26 18:15:16 2009
New Revision: 1321

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1321
Log:
* debian/patches:
  - 66_re-enable-gpg-agent, enable back gpg-agent.

Added:
    experimental/evolution-data-server/debian/patches/66_re-enable-gpg-agent.patch
Modified:
    experimental/evolution-data-server/debian/changelog

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=1321&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog (original)
+++ experimental/evolution-data-server/debian/changelog Wed Aug 26 18:15:16 2009
@@ -1,3 +1,10 @@
+evolution-data-server (2.27.91-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 66_re-enable-gpg-agent, enable back gpg-agent.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 26 Aug 2009 20:14:50 +0200
+
 evolution-data-server (2.27.91-1) experimental; urgency=low
 
   * New upstream beta release.

Added: experimental/evolution-data-server/debian/patches/66_re-enable-gpg-agent.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/patches/66_re-enable-gpg-agent.patch?rev=1321&op=file
==============================================================================
--- experimental/evolution-data-server/debian/patches/66_re-enable-gpg-agent.patch (added)
+++ experimental/evolution-data-server/debian/patches/66_re-enable-gpg-agent.patch Wed Aug 26 18:15:16 2009
@@ -1,0 +1,20 @@
+commit 881dd5896471df3348f396bdcd3572883d0b8a09
+Author: Yves-Alexis Perez <corsac at debian.org>
+Date:   Wed Aug 26 20:13:51 2009 +0200
+
+    Revert "Bug #350007 - evolution busy-waits on GPG signing operations"
+    
+    This reverts commit b2d5dc320e051df875be7847386044e8de33cbbd.
+
+diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
+index bfd508d..2db58e4 100644
+--- a/camel/camel-gpg-context.c
++++ b/camel/camel-gpg-context.c
+@@ -498,7 +498,6 @@ gpg_ctx_get_argv (struct _GpgCtx *gpg, gint status_fd, gchar **sfd, gint passwd_
+ 	g_ptr_array_add (argv, (guint8 *) "--no-secmem-warning");
+ 	g_ptr_array_add (argv, (guint8 *) "--no-greeting");
+ 	g_ptr_array_add (argv, (guint8 *) "--no-tty");
+-	g_ptr_array_add (argv, (guint8 *) "--no-use-agent");
+ 
+ 	if (passwd_fd == -1) {
+ 		/* only use batch mode if we don't intend on using the