[Gpg4win-commits] r1148 - in trunk: . patches/gpgme

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-04-02 21:11:13 +0200 (Thu, 02 Apr 2009)
New Revision: 1148

Removed:
   trunk/patches/gpgme/02-kleo-bugs-workaround.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
2009-04-02  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (EXTRA_DIST): Remove
	patches/gpgme/02-kleo-bugs-workaround.patch.
	* patches/gpgme/02-kleo-bugs-workaround.patch: Removed.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-02 19:08:47 UTC (rev 1147)
+++ trunk/ChangeLog	2009-04-02 19:11:13 UTC (rev 1148)
@@ -1,5 +1,9 @@
 2009-04-02  Marcus Brinkmann  <marcus at g10code.de>
 
+	* Makefile.am (EXTRA_DIST): Remove
+	patches/gpgme/02-kleo-bugs-workaround.patch.
+	* patches/gpgme/02-kleo-bugs-workaround.patch: Removed.
+
 	* Makefile.am (EXTRA_DIST): Add patches for claws.
 	* patches/claws-3.7.1/03-pipe.patch: New file.
 

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-04-02 19:08:47 UTC (rev 1147)
+++ trunk/Makefile.am	2009-04-02 19:11:13 UTC (rev 1148)
@@ -32,7 +32,6 @@
         patches/glib-2.12.12/02-gspawn-w32.patch \
         patches/glib-2.12.12/03-gspawn-w32-fixup.patch \
 	patches/gpgme/01-gpg2.patch \
-	patches/gpgme/02-kleo-bugs-workaround.patch \
 	patches/gpgme-1.1.7/01-registry.patch \
 	patches/gpgme-1.1.7/02-extern-umlaute.patch \
 	patches/gpgme-1.1.7/03-error-parsing.patch \

Deleted: trunk/patches/gpgme/02-kleo-bugs-workaround.patch
===================================================================
--- trunk/patches/gpgme/02-kleo-bugs-workaround.patch	2009-04-02 19:08:47 UTC (rev 1147)
+++ trunk/patches/gpgme/02-kleo-bugs-workaround.patch	2009-04-02 19:11:13 UTC (rev 1148)
@@ -1,85 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Work around bugs in kleopatra 20080706.
-
-diff -rup src/keylist.c src/keylist.c
---- src/keylist.c	2008-01-28 19:06:04.000000000 +0100
-+++ src/keylist.c	2008-07-08 21:16:39.000000000 +0200
-@@ -918,6 +918,14 @@ gpgme_op_keylist_end (gpgme_ctx_t ctx)
-   if (!ctx)
-     return gpg_error (GPG_ERR_INV_VALUE);
- 
-+  /* Work around missing gpgme_release in kleopatra, which creates
-+     dangling gpgsm processes.  */
-+  if (ctx->engine)
-+    {
-+      _gpgme_engine_release (ctx->engine);
-+      ctx->engine = NULL;
-+    }
-+
-   return 0;
- }
- 
-diff -rup src/w32-io.c src/w32-io.c
---- src/w32-io.c	2008-06-26 15:03:27.000000000 +0200
-+++ src/w32-io.c	2008-07-08 18:20:12.000000000 +0200
-@@ -53,8 +53,8 @@
- #define READBUF_SIZE 4096
- #define WRITEBUF_SIZE 4096
- #define PIPEBUF_SIZE  4096
--#define MAX_READERS 20
--#define MAX_WRITERS 20
-+#define MAX_READERS 40
-+#define MAX_WRITERS 40
- 
- static struct
- {
-diff -rup src/wait-global.c src/wait-global.c
---- src/wait-global.c	2008-07-04 16:15:41.000000000 +0200
-+++ src/wait-global.c	2008-07-08 21:15:03.000000000 +0200
-@@ -386,5 +386,13 @@ gpgme_wait (gpgme_ctx_t ctx, gpgme_error
-     }
-   while (hang);
- 
-+  /* Work around missing gpgme_release in kleopatra, which creates
-+     dangling gpgsm processes.  */
-+  if (ctx && ctx->engine)
-+    {
-+      _gpgme_engine_release (ctx->engine);
-+      ctx->engine = NULL;
-+    }
-+
-   return ctx;
- }
-diff -rup src/wait-private.c src/wait-private.c
---- src/wait-private.c	2008-07-04 16:15:41.000000000 +0200
-+++ src/wait-private.c	2008-07-08 21:17:05.000000000 +0200
-@@ -31,6 +31,7 @@
- #include "ops.h"
- #include "priv-io.h"
- #include "util.h"
-+#include "debug.h"
- 
- 
- /* The private event loops are used for all blocking operations, and
-@@ -149,5 +150,17 @@ _gpgme_wait_on_condition (gpgme_ctx_t ct
- gpgme_error_t
- _gpgme_wait_one (gpgme_ctx_t ctx)
- {
--  return _gpgme_wait_on_condition (ctx, NULL);
-+  gpgme_error_t err;
-+
-+  err = _gpgme_wait_on_condition (ctx, NULL);
-+
-+  /* Work around missing gpgme_release in kleopatra, which creates
-+     dangling gpgsm processes.  */
-+  if (ctx->engine)
-+    {
-+      _gpgme_engine_release (ctx->engine);
-+      ctx->engine = NULL;
-+    }
-+
-+  return err;
- }