2008-02-01 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 1 Feb 2008 20:15:07 +0000 (20:15 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 1 Feb 2008 20:15:07 +0000 (20:15 +0000)
* patches/gnupg2-2.0.8/05-gpgconf.patch: New file.
* Makefile.am (EXTRA_DIST): Add patch.

ChangeLog
Makefile.am
patches/gnupg2-2.0.8/05-gpgconf.patch [new file with mode: 0755]
src/make-msi.guids

index 867253e..6d0f136 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-01  Marcus Brinkmann  <marcus@g10code.de>
+
+       * patches/gnupg2-2.0.8/05-gpgconf.patch: New file.
+       * Makefile.am (EXTRA_DIST): Add patch.
+
 2008-01-30  Marcus Brinkmann  <marcus@g10code.de>
 
        * src/gpg4win.nsi: Fix last change.
index 173115e..5dfb5e8 100644 (file)
@@ -62,6 +62,7 @@ EXTRA_DIST = autogen.sh README.SVN \
        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:
diff --git a/patches/gnupg2-2.0.8/05-gpgconf.patch b/patches/gnupg2-2.0.8/05-gpgconf.patch
new file mode 100755 (executable)
index 0000000..56774ca
--- /dev/null
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2008-02-01  Marcus Brinkmann  <marcus@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);
+           }
index 1cbbf64..d20a360 100644 (file)
@@ -9,6 +9,7 @@ f5898ebd-f30a-4cfc-9763-2a98befe6719 /PRODUCT/1.9.0.613
 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