[Gpg4win-commits] r666 - in trunk: . packages patches/gpgme

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-01-04 16:29:33 +0100 (Fri, 04 Jan 2008)
New Revision: 666

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/patches/gpgme/01-gpg2.patch
Log:
2008-01-04  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update gpgme to 1.1.6.
	* patches/gpgme/01-gpg2.patch: Update patch.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-03 16:03:43 UTC (rev 665)
+++ trunk/ChangeLog	2008-01-04 15:29:33 UTC (rev 666)
@@ -1,3 +1,8 @@
+2008-01-04  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update gpgme to 1.1.6.
+	* patches/gpgme/01-gpg2.patch: Update patch.
+
 2008-01-03  Werner Koch  <wk at g10code.com>
 
 	* src/inst-gnupg.nsi: Do not set gpgProgram but delete it.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-01-03 16:03:43 UTC (rev 665)
+++ trunk/packages/packages.current	2008-01-04 15:29:33 UTC (rev 666)
@@ -270,15 +270,15 @@
 file libassuan/libassuan-1.0.4.tar.bz2
 chk  4b720706a8e4251d8cb7a0f2336226907df1426c
 
+file gpgme/gpgme-1.1.6.tar.bz2
+chk  05218df939d72c2fd6d74f22c2b5d5ade0718b7a
+
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
 file pinentry-0.7.5-cvs.tar.gz
 chk  85919f061e4fa432fd3659de89a301878c6c7d25
 
-file gpgme-1.1.6-svn1279.tar.bz2
-chk  9751403f5c90c973fc47a5659f1fa67126253ab6
-
 file dirmngr-1.0.2-svn275.tar.bz2
 chk  7a0f5eb38041ce152dd8111fcf43eb45ba3482f4
 

Modified: trunk/patches/gpgme/01-gpg2.patch
===================================================================
--- trunk/patches/gpgme/01-gpg2.patch	2008-01-03 16:03:43 UTC (rev 665)
+++ trunk/patches/gpgme/01-gpg2.patch	2008-01-04 15:29:33 UTC (rev 666)
@@ -7,13 +7,15 @@
 
 --- gpgme/w32-util.c
 +++ gpgme/w32-util.c
-@@ -274,7 +275,7 @@
+@@ -307,9 +307,9 @@
    if (!gpg_program)
      gpg_program = find_program_in_registry ("gpgProgram");
    if (!gpg_program)
+-    gpg_program = find_program_in_inst_dir ("gpg.exe");
++    gpg_program = find_program_in_inst_dir ("gpg2.exe");
+   if (!gpg_program)
 -    gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg.exe");
 +    gpg_program = find_program_at_standard_place ("GNU\\GnuPG\\gpg2.exe");
- #ifdef GPG_PATH
-   if (!gpg_program)
-     gpg_program = GPG_PATH;
-
+   UNLOCK (get_path_lock);
+   return gpg_program;
+ }