[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.2-16-ge3fafc5

[by Andre Heinecke]

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  e3fafc5ac830276ff5c38779f3ae70b6b3cb712e (commit)
      from  1e61cbb5a1a3c901db6cc4c21d40c4fcb5d402e1 (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 e3fafc5ac830276ff5c38779f3ae70b6b3cb712e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Nov 18 16:38:10 2014 +0100

    More fixes for (portable) Vanilla installer
    
        * src/gpg4win.nsi (GPG4WIN_VANILLA): Include libtasn.
        * src/mkportable-vanilla.h: Include libtasn and gnutls.

diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 4a62a05..d89b354 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -56,9 +56,9 @@
 !ifdef HAVE_PKG_LIBGSASL
 !undef HAVE_PKG_LIBGSASL
 !endif
-!ifdef HAVE_PKG_LIBTASN1
-!undef HAVE_PKG_LIBTASN1
-!endif
+;!ifdef HAVE_PKG_LIBTASN1
+;!undef HAVE_PKG_LIBTASN1
+;!endif
 ;!ifdef HAVE_PKG_GNUTLS
 ;!undef HAVE_PKG_GNUTLS
 ;!endif
diff --git a/src/mkportable-vanilla.h b/src/mkportable-vanilla.h
index 9394b33..cbed38e 100644
--- a/src/mkportable-vanilla.h
+++ b/src/mkportable-vanilla.h
@@ -27,10 +27,14 @@ const char * const vanilla_files[] =
   "libffi-6.dll",
   "libgcrypt-20.dll",
   "libgdk_pixbuf-2.0-0.dll",
+  "libgnutls-26.dll",
+  "libgnutls-extra-26.dll",
+  "libgnutls-openssl-27.dll",
   "libgpg-error-0.dll",
   "libiconv-2.dll",
   "libintl-8.dll",
   "libksba-8.dll",
+  "libtasn1-3.dll",
   "libw32pth-0.dll",
   "md5sum.exe",
   "paperkey.exe",

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

Summary of changes:
 src/gpg4win.nsi          |    6 +++---
 src/mkportable-vanilla.h |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)


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