[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.1-21-g333434d

[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  333434dcf9f500ebd87f19a62dcc29b2d1097fb6 (commit)
       via  1dcf05dd814dda8e5a67d4b61bde6ea55aedacfd (commit)
      from  ad1813f5abd892ee6568e8488799e7c14776e6e8 (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 333434dcf9f500ebd87f19a62dcc29b2d1097fb6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 6 12:38:34 2014 +0000

    Update libgcrypt to 1.6.1
    
        * packages/packages.current (libgcrypt): Update

diff --git a/packages/packages.current b/packages/packages.current
index e9645a5..398e5bd 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -403,12 +403,9 @@ server ftp://ftp.gnupg.org/gcrypt
 file libgpg-error/libgpg-error-1.13.tar.bz2
 chk  50fbff11446a7b0decbf65a6e6b0eda17b5139fb
 
-# checked: 2014-07-16 ah - not updated
-# with 1.6.1 gnutls 2.12.21 fails to compile (wk?)
-#file libgcrypt/libgcrypt-1.6.1.tar.bz2
-#chk  f03d9b63ac3b17a6972fc11150d136925b702f02
-file libgcrypt/libgcrypt-1.5.3.tar.bz2
-chk  2c6553cc17f2a1616d512d6870fe95edf6b0e26e
+# checked: 2014-08-06 ah - updated
+file libgcrypt/libgcrypt-1.6.1.tar.bz2
+chk  f03d9b63ac3b17a6972fc11150d136925b702f02
 
 # checked: 2014-07-16 ah
 file libksba/libksba-1.3.0.tar.bz2

commit 1dcf05dd814dda8e5a67d4b61bde6ea55aedacfd
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 6 12:37:43 2014 +0000

    Add patch to compile gnutls with gcrypt 1.6
    
        * patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch: New.

diff --git a/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch b/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch
new file mode 100755
index 0000000..c4efe34
--- /dev/null
+++ b/patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch
@@ -0,0 +1,44 @@
+#! /bin/sh
+patch -p0 -l -f $* < $0
+exit $?
+
+2014-08-06  Andre Heinecke  <aheinecke at intevation.de>
+
+	* lib/gcrypt/init.c: Use GCRY_THREAD_OPTION_PTHREAD_IMPL macro
+	instead of defining the gcry_thread_cbs structure itself.
+
+--- lib/gcrypt/init.c.oirg	2014-08-06 11:52:26.858064946 +0000
++++ lib/gcrypt/init.c	2014-08-06 12:10:31.121726144 +0000
+@@ -32,16 +32,9 @@
+ /* Functions that refer to the initialization of the libgcrypt library.
+  */
+
+-static struct gcry_thread_cbs gct = {
+-  .option = (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
+-  .init = NULL,
+-  .select = NULL,
+-  .waitpid = NULL,
+-  .accept = NULL,
+-  .connect = NULL,
+-  .sendmsg = NULL,
+-  .recvmsg = NULL,
+-};
++GCRY_THREAD_OPTION_PTHREAD_IMPL;
++
++static struct gcry_thread_cbs gct;
+
+ int
+ gnutls_crypto_init (void)
+@@ -53,11 +46,12 @@
+
+       if (gnutls_mutex_init != NULL)
+         {
++#if GCRYPT_VERSION_NUMBER < 0x010600
+           gct.mutex_init = gnutls_mutex_init;
+           gct.mutex_destroy = gnutls_mutex_deinit;
+           gct.mutex_lock = gnutls_mutex_lock;
+           gct.mutex_unlock = gnutls_mutex_unlock;
+-
++#endif
+           gcry_control (GCRYCTL_SET_THREAD_CBS, &gct);
+         }

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

Summary of changes:
 packages/packages.current                          |    9 ++--
 .../fix-gcrypt-private-api-usage.patch             |   44 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100755 patches/gnutls-2.12.23/fix-gcrypt-private-api-usage.patch


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