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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-09-29 21:05:58 +0200 (Mon, 29 Sep 2008)
New Revision: 931

Removed:
   trunk/patches/gnupg2/02-p12-hack.patch
   trunk/patches/gnupg2/03-argv-quote-fix.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/packages/packages.current
Log:
Update GnuPG


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-29 18:14:07 UTC (rev 930)
+++ trunk/ChangeLog	2008-09-29 19:05:58 UTC (rev 931)
@@ -1,3 +1,10 @@
+2008-09-29  Werner Koch  <wk at g10code.com>
+
+	* patches/gnupg2/02-p12-hack.patch: Remove. 
+	* patches/gnupg2/03-argv-quote-fix.patch: Remove. 
+
+	* packages/packages.current: Update GnuPG.
+
 2008-09-29  Colin Leroy  <colin at colino.net>
 
 	* packages/packages.current: Update Claws and VCalendar (bugfixes).

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-09-29 18:14:07 UTC (rev 930)
+++ trunk/Makefile.am	2008-09-29 19:05:58 UTC (rev 931)
@@ -50,8 +50,6 @@
 	patches/libetpan-0.54/02-index.patch \
 	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-29 18:14:07 UTC (rev 930)
+++ trunk/NEWS	2008-09-29 19:05:58 UTC (rev 931)
@@ -13,7 +13,7 @@
      eingesetzt werden.
 
 ~~~~~~~~~~~~~~~
-GnuPG:        2.0.10-svn4809
+GnuPG:        2.0.10-svn4835
 DirMngr:      1.0.3-svn307
 Kleopatra:    
 GPA:          0.8.0

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-09-29 18:14:07 UTC (rev 930)
+++ trunk/packages/packages.current	2008-09-29 19:05:58 UTC (rev 931)
@@ -325,9 +325,9 @@
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
-name gnupg2-2.0.10-svn4809.tar.bz2
-file gnupg-2.0.10-svn4809.tar.bz2
-chk  c784ecad4ee8e15c1cc9431ef5f20d372bb4f9f5
+name gnupg2-2.0.10-svn4835.tar.bz2
+file gnupg-2.0.10-svn4835.tar.bz2
+chk  aaaa650f4ae5ef01dca554b241be77ac1dfce7ac
 
 file gpgme-1.1.7-svn1327.tar.bz2
 chk  4a0b67c6678cfe5b1e8c0fb3cef5a14677015221

Deleted: trunk/patches/gnupg2/02-p12-hack.patch
===================================================================
--- trunk/patches/gnupg2/02-p12-hack.patch	2008-09-29 18:14:07 UTC (rev 930)
+++ trunk/patches/gnupg2/02-p12-hack.patch	2008-09-29 19:05:58 UTC (rev 931)
@@ -1,73 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-2008-05-21  Marcus Brinkmann  <marcus at ulysses.g10code.com>
-
-	* call-agent.c (gpgsm_agent_nop) [HAVE_W32_SYSTEM]: New function.
-	* export.c (export_p12) [HAVE_W32_SYSTEM]: Call gpgsm_agent_nop.
-	* import.c (parse_p12) [HAVE_W32_SYSTEM]: Call gpgsm_agent_nop.
-
-
-Index: sm/call-agent.c
-===================================================================
---- sm/call-agent.c	(revision 4765)
-+++ sm/call-agent.c	(working copy)
-@@ -802,3 +802,23 @@
-                         default_inq_cb, ctrl, NULL, NULL);
-   return rc;
- }
-+
-+
-+#ifdef HAVE_W32_SYSTEM
-+/* Ensure that the agent is up and running.  Only for Windows, as in
-+   Unix the agent may be started in pipe server mode rather than
-+   daemon mode.  */
-+gpg_error_t
-+gpgsm_agent_nop (ctrl_t ctrl)
-+{
-+  int rc;
-+
-+  rc = start_agent (ctrl);
-+  if (rc)
-+    return rc;
-+
-+  rc = assuan_transact (agent_ctx, "NOP", NULL, NULL,
-+                        default_inq_cb, ctrl, NULL, NULL);
-+  return rc;
-+}
-+#endif
-Index: sm/import.c
-===================================================================
---- sm/import.c	(revision 4765)
-+++ sm/import.c	(working copy)
-@@ -507,6 +507,12 @@
-   pid_t pid = -1;
-   int bad_pass = 0;
- 
-+#ifdef HAVE_W32_SYSTEM
-+  err = gpgsm_agent_nop (ctrl);
-+  if (err)
-+    return err;
-+#endif
-+
-   if (!opt.protect_tool_program || !*opt.protect_tool_program)
-     pgmname = gnupg_module_name (GNUPG_MODULE_NAME_PROTECT_TOOL);
-   else
-Index: sm/export.c
-===================================================================
---- sm/export.c	(revision 4765)
-+++ sm/export.c	(working copy)
-@@ -616,6 +616,12 @@
-   pid_t pid = -1;
-   int bad_pass = 0;
- 
-+#ifdef HAVE_W32_SYSTEM
-+  err = gpgsm_agent_nop (ctrl);
-+  if (err)
-+    return err;
-+#endif
-+
-   if (!opt.protect_tool_program || !*opt.protect_tool_program)
-     pgmname = gnupg_module_name (GNUPG_MODULE_NAME_PROTECT_TOOL);
-   else

Deleted: trunk/patches/gnupg2/03-argv-quote-fix.patch
===================================================================
--- trunk/patches/gnupg2/03-argv-quote-fix.patch	2008-09-29 18:14:07 UTC (rev 930)
+++ trunk/patches/gnupg2/03-argv-quote-fix.patch	2008-09-29 19:05:58 UTC (rev 931)
@@ -1,28 +0,0 @@
-#! /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;
-
-