[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-49-gb3201d9

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  b3201d93e757f2982e26c59c19089be312bdbc74 (commit)
      from  4082b910cd831789ad3cc88fbf436a4491ae5352 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3201d93e757f2982e26c59c19089be312bdbc74
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Aug 12 14:58:49 2013 +0200

    Update gpgme to 1.4.3.
    
    * packages/packages.current:
    * patches/gpgme/01-gpg2.patch: Remove.
    * Makefile.am (EXTRA_DIST): Remove patch.

diff --git a/Makefile.am b/Makefile.am
index 84e0641..67cf925 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/glib-2.34.3/01-socket.patch \
         patches/glib-2.34.3/02-no-kill.patch \
         patches/libxml2-2.7.8/01-cve-2012-5134 \
-	patches/gpgme/01-gpg2.patch \
 	patches/gnupg2/01-version.patch.in \
 	patches/gnupg2-2.0.20/02-allow-mark-trusted.patch \
 	patches/dirmngr-1.1.0/01-mmap.patch \
diff --git a/packages/packages.current b/packages/packages.current
index a10ab62..89a025e 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -416,9 +416,9 @@ chk  de4ba5ef9a1ced4e4f8543feac553d4cf68dea00
 file scute/scute-1.4.0.tar.bz2
 chk  e28141d2b03612c09512651795976c58ed3f8035
 
-# checked: 2013-05-28 wk - updated
-file gpgme/gpgme-1.4.2.tar.bz2
-chk  75051ec9ecd080ae105423bd72f260350a470bc8
+# checked: 2013-08-12 wk - updated
+file gpgme/gpgme-1.4.3.tar.bz2
+chk  ffdb5e4ce85220501515af8ead86fd499525ef9a
 
 # checked: 2013-05-01 wk - updated
 file gpa/gpa-0.9.4.tar.bz2
diff --git a/patches/gpgme/01-gpg2.patch b/patches/gpgme/01-gpg2.patch
deleted file mode 100755
index 5cc7b89..0000000
--- a/patches/gpgme/01-gpg2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Change gpgme to use gpg2.exe by default.
-
-
---- src/w32-util.c
-+++ src/w32-util.c
-@@ -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");
-   UNLOCK (get_path_lock);
-   return gpg_program;
- }

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                 |    1 -
 packages/packages.current   |    6 +++---
 patches/gpgme/01-gpg2.patch |   21 ---------------------
 3 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100755 patches/gpgme/01-gpg2.patch


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org