[Gpg4win-commits] r703 - in trunk: . patches/gnupg2-2.0.8 src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-02-01 21:15:07 +0100 (Fri, 01 Feb 2008)
New Revision: 703

Added:
   trunk/patches/gnupg2-2.0.8/05-gpgconf.patch
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/src/make-msi.guids
Log:
2008-02-01  Marcus Brinkmann  <marcus at g10code.de>

	* patches/gnupg2-2.0.8/05-gpgconf.patch: New file.
	* Makefile.am (EXTRA_DIST): Add patch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-01 10:29:34 UTC (rev 702)
+++ trunk/ChangeLog	2008-02-01 20:15:07 UTC (rev 703)
@@ -1,3 +1,8 @@
+2008-02-01  Marcus Brinkmann  <marcus at g10code.de>
+
+	* patches/gnupg2-2.0.8/05-gpgconf.patch: New file.
+	* Makefile.am (EXTRA_DIST): Add patch.
+
 2008-01-30  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/gpg4win.nsi: Fix last change.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-02-01 10:29:34 UTC (rev 702)
+++ trunk/Makefile.am	2008-02-01 20:15:07 UTC (rev 703)
@@ -62,6 +62,7 @@
 	patches/gnupg2-2.0.8/02-qualified.patch \
 	patches/gnupg2-2.0.8/03-create-keyring.patch \
         patches/gnupg2-2.0.8/04-import-export-spawn.patch \
+        patches/gnupg2-2.0.8/05-gpgconf.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch
 
 copy-news:

Added: trunk/patches/gnupg2-2.0.8/05-gpgconf.patch
===================================================================
--- trunk/patches/gnupg2-2.0.8/05-gpgconf.patch	2008-02-01 10:29:34 UTC (rev 702)
+++ trunk/patches/gnupg2-2.0.8/05-gpgconf.patch	2008-02-01 20:15:07 UTC (rev 703)
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2008-02-01  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgconf-comp.c (gc_component_list_options): Fix memcpy.
+	Reported by Marc Mutz.
+
+Index: tools/gpgconf-comp.c
+===================================================================
+--- tools/gpgconf-comp.c	(revision 4686)
++++ tools/gpgconf-comp.c	(working copy)
+@@ -1568,7 +1568,7 @@
+ 	      gc_option_t opt_copy;
+ 
+ 	      /* Fix up the group level.  */
+-	      memcpy (&opt_copy, option, sizeof (opt));
++	      memcpy (&opt_copy, option, sizeof (opt_copy));
+ 	      opt_copy.level = level;
+ 	      list_one_option (&opt_copy, out);
+ 	    }


Property changes on: trunk/patches/gnupg2-2.0.8/05-gpgconf.patch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/src/make-msi.guids
===================================================================
--- trunk/src/make-msi.guids	2008-02-01 10:29:34 UTC (rev 702)
+++ trunk/src/make-msi.guids	2008-02-01 20:15:07 UTC (rev 703)
@@ -9,6 +9,7 @@
 bf1af37b-2d40-4956-add4-3abb7154b0ed /PRODUCT/1.9.0.625
 d75a8790-3457-49aa-ac8d-946a33c7bb1a /PRODUCT/1.9.0.668
 3f94d3d4-7d64-44fc-a2be-28073eb595e1 /PRODUCT/1.9.0.682
+7a0ce0e2-f75c-4f08-83dd-fd8fc4bcddfe /PRODUCT/1.9.0.691
 fb54db39-2456-4fcc-9550-2790db663015 /REGISTRY/HKLM/Software\GNU\GnuPG/Install Directory
 ad23691b-1734-4dec-b91a-d4ff286190ea /REGISTRY/HKLM/Software\GNU\GnuPG/gpgProgram
 e0807a2f-4e70-48f8-b047-c5d3e219c3e7 /UPGRADE/1