[Gpg4win-commits] r679 - in trunk: . patches patches/gnupg-2.0.8

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-15 17:40:52 +0100 (Tue, 15 Jan 2008)
New Revision: 679

Added:
   trunk/patches/gnupg-2.0.8/
   trunk/patches/gnupg-2.0.8/01-agent-call-pinentry.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
Log:
2008-01-15  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (EXTRA_DIST): Add
	patches/gnupg-2.0.8/01-agent-call-pinentry.patch.
	* patches/gnupg-2.0.8/01-agent-call-pinentry.patch: New file.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-15 16:08:03 UTC (rev 678)
+++ trunk/ChangeLog	2008-01-15 16:40:52 UTC (rev 679)
@@ -1,5 +1,9 @@
 2008-01-15  Marcus Brinkmann  <marcus at g10code.de>
 
+	* Makefile.am (EXTRA_DIST): Add
+	patches/gnupg-2.0.8/01-agent-call-pinentry.patch.
+	* patches/gnupg-2.0.8/01-agent-call-pinentry.patch: New file.
+
 	* src/g4wihelp.c (service_create): Use LocalSystem for now.
 
 2008-01-13  Marcus Brinkmann  <marcus at g10code.de>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-01-15 16:08:03 UTC (rev 678)
+++ trunk/Makefile.am	2008-01-15 16:40:52 UTC (rev 679)
@@ -1,5 +1,5 @@
 # Makefile.am - Installer for GnuPG 4 Windows Makefile.
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -58,6 +58,7 @@
 	patches/claws-mail-3.1.0cvs70/03-smime-plugin.patch \
 	patches/claws-mail-3.1.0cvs70/99-auto.patch \
 	patches/gpgme/01-gpg2.patch \
+	patches/gnupg-2.0.8/01-agent-call-pinentry.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch
 
 copy-news:

Added: trunk/patches/gnupg-2.0.8/01-agent-call-pinentry.patch
===================================================================
--- trunk/patches/gnupg-2.0.8/01-agent-call-pinentry.patch	2008-01-15 16:08:03 UTC (rev 678)
+++ trunk/patches/gnupg-2.0.8/01-agent-call-pinentry.patch	2008-01-15 16:40:52 UTC (rev 679)
@@ -0,0 +1,27 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2008-01-15  Marcus Brinkmann  <marcus at g10code.de>
+
+	* call-pinentry.c (start_pinentry): Start pinentry in detached
+	mode.
+
+Index: agent/call-pinentry.c
+===================================================================
+--- agent/call-pinentry.c	(revision 4674)
++++ agent/call-pinentry.c	(working copy)
+@@ -271,9 +271,11 @@
+   no_close_list[i] = -1;
+ 
+   /* Connect to the pinentry and perform initial handshaking.  Note
+-     that atfork is used to change the environment for pinentry. */
++     that atfork is used to change the environment for pinentry.  We
++     start the server in detached mode to suppress the console window
++     under Windows.  */
+   rc = assuan_pipe_connect_ext (&ctx, opt.pinentry_program, argv,
+-                                no_close_list, atfork_cb, ctrl, 0);
++                                no_close_list, atfork_cb, ctrl, 128);
+   if (rc)
+     {
+       log_error ("can't connect to the PIN entry module: %s\n",


Property changes on: trunk/patches/gnupg-2.0.8/01-agent-call-pinentry.patch
___________________________________________________________________
Name: svn:executable
   + *