[Gpg4win-commits] r906 - in trunk: . packages patches/gnupg2

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-09-09 10:10:54 +0200 (Tue, 09 Sep 2008)
New Revision: 906

Added:
   trunk/patches/gnupg2/03-argv-quote-fix.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/packages/packages.current
Log:
Add patch for mingw bug.
Update GPA.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-09 06:06:00 UTC (rev 905)
+++ trunk/ChangeLog	2008-09-09 08:10:54 UTC (rev 906)
@@ -1,3 +1,10 @@
+2008-09-09  Werner Koch  <wk at g10code.com>
+
+	* patches/gnupg2/03-argv-quote-fix.patch: New. 
+	* Makefile.am (EXTRA_DIST): Add it.
+
+	* packages/packages.current: Update GPA.
+
 2008-09-09  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-09-09 06:06:00 UTC (rev 905)
+++ trunk/Makefile.am	2008-09-09 08:10:54 UTC (rev 906)
@@ -47,6 +47,7 @@
 	patches/winpt/01-gpg-path.patch \
 	patches/gnupg2/01-version.patch.in \
 	patches/gnupg2/02-p12-hack.patch \
+        patches/gnupg2/03-argv-quote-fix.patch \
 	patches/gnupg2-2.0.9/01-close-all-handle.patch \
 	patches/gnupg2-2.0.9/02-de.po-fix.patch \
 	patches/gnupg2-2.0.9/03-i18n+etc.patch \

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-09-09 06:06:00 UTC (rev 905)
+++ trunk/NEWS	2008-09-09 08:10:54 UTC (rev 906)
@@ -3,6 +3,27 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in version 1.9.6 (2008-09-09)
+------------------------------------------------
+
+(en) This is a BETA version of the new Gpg4win/2 architecture.
+     This version shall not be used in a production environment. 
+(de) Dies ist eine BETA Version der neuen Gpg4win/2 Architektur.
+     Diese Version soll nicht in einer Produktivumgebung
+     eingesetzt werden.
+
+~~~~~~~~~~~~~~~
+GnuPG:        2.0.10-svn4809
+DirMngr:      1.0.3-svn307
+Kleopatra:    20080811-6
+GPA:          0.8.0
+GpgOL:        0.10.15
+GpgEX:        0.9.0
+Claws-Mail:   3.4.0
+Kompendium:   3.0.0-beta
+~~~~~~~~~~~~~~~
+
+
 Noteworthy changes in version 1.9.6 (2008-08-11)
 ------------------------------------------------
 

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-09-09 06:06:00 UTC (rev 905)
+++ trunk/packages/packages.current	2008-09-09 08:10:54 UTC (rev 906)
@@ -315,16 +315,10 @@
 #
 # GPA
 #
+server http://wald.intevation.org/frs/download.php
+file   491/gpa-0.8.0.tar.bz2
+chk    c519af3ccd3c7e518458e143b2001a8cc6d90467
 
-#server http://wald.intevation.org/frs/download.php
-#file 350/gpa-0.7.6.tar.bz2
-#chk  bb9182cd4c6bd6677ba9cdcca262dcc1b1d22c3c
-
-server ftp://ftp.g10code.com/g10code/scratch
-file gpa-0.7.7-svn899.tar.bz2
-chk  98b95913307da43cc34447223e84247753b7e4b4
-
-
 #
 # Qt
 #

Added: trunk/patches/gnupg2/03-argv-quote-fix.patch
===================================================================
--- trunk/patches/gnupg2/03-argv-quote-fix.patch	2008-09-09 06:06:00 UTC (rev 905)
+++ trunk/patches/gnupg2/03-argv-quote-fix.patch	2008-09-09 08:10:54 UTC (rev 906)
@@ -0,0 +1,28 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2008-09-04  Werner Koch  <wk at g10code.com>
+
+	* certdump.c (gpgsm_format_keydesc): Work around a mingw32 bug.
+
+
+--- sm/certdump.c       (revision 4822)
++++ sm/certdump.c       (working copy)
+@@ -979,7 +979,13 @@
+   buffer = p = xtrymalloc (strlen (name) * 3 + 1);
+   for (s=name; *s; s++)
+     {
+-      if (*s < ' ' || *s == '+')
++      /* We also escape the quote character to work around a bug in
++         the mingw32 runtime which does not correcty handle command
++         line quoting.  We correctly double the quote mark when
++         calling a program (i.e. gpg-protect-tool), but the pre-main
++         code does not notice the double quote as an escaped
++         quote.  */
++      if (*s < ' ' || *s == '+' || *s == '\"')
+         {
+           sprintf (p, "%%%02X", *(unsigned char *)s);
+           p += 3;
+
+