[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-124-ga86a6bf

by Werner Koch cvs at cvs.gnupg.org
Fri Apr 26 11:49:18 CEST 2013 

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  a86a6bf78f837601be00e5767a463b58c1f98707 (commit)
       via  b5a0549e0a300bb0537559ba2245a6b8523d2763 (commit)
      from  c2d43000f8879ba11a016636e39c351962139417 (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 a86a6bf78f837601be00e5767a463b58c1f98707
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 26 11:25:51 2013 +0200

    Update dirmngr to version 1.1.1.

diff --git a/packages/packages.current b/packages/packages.current
index 0315460..7bfcf7b 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -376,9 +376,9 @@ name gnupg2-2.0.20-beta118.tar.bz2
 file alpha/gnupg/gnupg-2.0.20-beta118.tar.bz2
 chk  4dafebee7b0c7adde2b27473faca7236851cf472
 
-# checked: 2013-04-23 wk
-file dirmngr/dirmngr-1.1.0.tar.bz2
-chk  a7a7d1432db9edad2783ea1bce761a8106464165
+# checked: 2013-04-26 wk
+file dirmngr/dirmngr-1.1.1.tar.bz2
+chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
 
 # checked: 2012-03-28 wk - updated
 #          2012-12-07 wk - can't update to 0.8.2 due to MOC problems.

commit b5a0549e0a300bb0537559ba2245a6b8523d2763
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Apr 25 17:54:45 2013 +0200

    Fix building of GNUTLS and update to latest 2.x version.
    
    * patches/gnutls-2.12.21/01-openssl-wincrypt.patch: New.
    * Makefile.am: Add patch.
    * src/Makefile.am (gpg4win_pkg_gnutls_configure): Force building with
    libgcrypt.  Disable pkcs11 module.
    (LTLIBTASN1):
    (gpg4win_pkg_gnutls_make_args): Add hack to allow building latest
    version.
    --
    
    gnutls 2.12.21 does not seem to be well tested with Windows.  At least
    not with w64-mingw32.  This is a minimal fix which is not guarnteed to
    always work.

diff --git a/Makefile.am b/Makefile.am
index 433cd16..6884b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,9 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
 	patches/libetpan-0.57/01-gnutls_compat.patch \
         patches/scute-1.2.0/01-bugfixes.patch \
         patches/scute-1.3.0/01-wsastartup.patch \
-        patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch
+        patches/claws-mail-3.8.0cvs30/01-glib-h-only.patch \
+	patches/gnutls-2.12.21/01-openssl-wincrypt.patch
+
 
 copy-news:
 	cp NEWS doc/website/NEWS.last
diff --git a/packages/packages.current b/packages/packages.current
index 9ef8356..0315460 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -44,14 +44,17 @@ chk  4aa358a95d1e5774603e6fa149c926a80df43559
 
 server ftp://ftp.gnu.org/pub/gnu
 
-file gsasl/libgsasl-1.4.4.tar.gz
-chk  d32d29a5c599b2d54f214fc5747559bc890f24de
+# checked: 2013-04-25 wk
+file gsasl/libgsasl-1.8.0.tar.gz
+chk  08fd5dfdd3d88154cf06cb0759a732790c47b4f7
 
-file libtasn1/libtasn1-2.2.tar.gz
-chk  d6e0d449cf2da04c93f498d2cf4415f572611b46
+# checked: 2013-04-25 wk
+file libtasn1/libtasn1-2.14.tar.gz
+chk  22f9e0b15f870c8e03ac9cc1ead969d4d84eb931
 
-file gnutls/gnutls-2.8.6.tar.bz2
-chk  bff911d4fd7389aa6698a644b3748eb2d23715bc
+# checked: 2013-04-25 wk
+file gnutls/gnutls-2.12.21.tar.bz2
+chk  a02bef78c7e35217d84d36d9b3135de70b46be09
 
 
 #
diff --git a/patches/gnutls-2.12.21/01-openssl-wincrypt.patch b/patches/gnutls-2.12.21/01-openssl-wincrypt.patch
new file mode 100755
index 0000000..4c6189d
--- /dev/null
+++ b/patches/gnutls-2.12.21/01-openssl-wincrypt.patch
@@ -0,0 +1,36 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+2013-04-25  Werner Koch  <wk at gnupg.org>
+
+	Fix name clash between wincrypt.h and openssl.h.
+	* libextra/gnutls_openssl.c: Undef X509_NAME.
+	* libextra/includes/gnutls/openssl.h: Ditto.
+
+
+--- libextra/gnutls_openssl.c~	2012-01-06 20:06:24.000000000 +0100
++++ libextra/gnutls_openssl.c	2013-04-25 11:22:22.878826900 +0200
+@@ -35,6 +35,9 @@
+    name, so restore the original name. */
+ #undef shutdown
+
++/* wincrypt.h defines a X509_NAME macro.  But it is a type for us.  */
++#undef X509_NAME
++
+ /* XXX: See lib/gnutls_int.h. */
+ #define GNUTLS_POINTER_TO_INT(_) ((int) GNUTLS_POINTER_TO_INT_CAST (_))
+ #define GNUTLS_INT_TO_POINTER(_) ((void*) GNUTLS_POINTER_TO_INT_CAST (_))
+--- libextra/includes/gnutls/openssl.h~	2012-01-06 20:06:24.000000000 +0100
++++ libextra/includes/gnutls/openssl.h	2013-04-25 11:21:52.346829024 +0200
+@@ -42,6 +42,10 @@
+
+ #include <gnutls/gnutls.h>
+
++/* wincrypt.h defines a X509_NAME macro.  But it is a type for us.  */
++#undef X509_NAME
++
++
+ /* Extra definitions that do not longer exist in gnutls.
+  */
+ #define GNUTLS_X509_CN_SIZE 256
diff --git a/src/Makefile.am b/src/Makefile.am
index ef75916..f9cb9dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -260,11 +260,22 @@ gpg4win_pkg_gpgex_configure = --silent \
   --with-gpg-error-prefix=$(idir) \
   --with-libassuan-prefix=$(idir)
 
+# We want to build with libgcrypt
+# We can't use pkcs11 tue to tto much additional dependencies.
 gpg4win_pkg_gnutls_configure = \
   --disable-cxx \
+  --with-libgcrypt \
+  --without-p11-kit \
   --with-libtasn1-prefix=$(idir) \
   --with-libgcrypt-prefix=$(idir)
 
+# In 2.12.21 gnutls_openssl is not linked to libtasn1, thus we use
+# this hack to here.  (Using the included minitasn does work either
+# due to a missing soruce file.)
+gpg4win_pkg_gnutls_make_args = \
+   LTLIBTASN1=-ltasn1
+
+
 gpg4win_pkg_curl_configure = \
   --with-gnutls --without-ca-bundle --with-libiconv-prefix=$(idir)
 
@@ -458,6 +469,21 @@ define gpg4win_pkg_enchant_post_install
  perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
 endef
 
+define gpg4win_pkg_libgsasl_post_install
+ (cd $$$${pkgidir};							\
+ perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
+endef
+
+define gpg4win_pkg_libtasn1_post_install
+ (cd $$$${pkgidir};							\
+ perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
+endef
+
+define gpg4win_pkg_gnutls_post_install
+ (cd $$$${pkgidir};							\
+ perl -pi -e 's/^prefix=.*$$$$/prefix=\/usr/' `find . -name \*.pc`)
+endef
+
 
 define gpg4win_pkg_libiconv_post_install
 (cp $(srcdir)/libiconv.def $$$${pkgidir}/lib;		\

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

Summary of changes:
 Makefile.am                                      |    4 ++-
 packages/packages.current                        |   21 +++++++-----
 patches/gnutls-2.12.21/01-openssl-wincrypt.patch |   36 ++++++++++++++++++++++
 src/Makefile.am                                  |   26 ++++++++++++++++
 4 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100755 patches/gnutls-2.12.21/01-openssl-wincrypt.patch


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

More information about the Gpg4win-commits mailing list