Mercurial > mxe-octave

changeset 4313:3d768e8ec06a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnupg: update packages * src/libgcrypt.mk: update version, checksum 1.7.5 * src/libgpg_error.mk: update version, checksum 1.26 * src/mingw-libgcrypt-1-fixes.patch: update patch from mxe.cc
author John D
date Wed, 04 Jan 2017 08:32:17 -0500
parents 5f24a9910a14
children dbe6064ffb0f
files src/libgcrypt.mk src/libgpg_error.mk src/mingw-libgcrypt-1-fixes.patch
diffstat 3 files changed, 211 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/libgcrypt.mk	Wed Jan 04 08:32:16 2017 -0500
+++ b/src/libgcrypt.mk	Wed Jan 04 08:32:17 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgcrypt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.1
-$(PKG)_CHECKSUM := f03d9b63ac3b17a6972fc11150d136925b702f02
+$(PKG)_VERSION  := 1.7.5
+$(PKG)_CHECKSUM := fa485d854748fc06ea041b3057b2de2f12fbc17f
 $(PKG)_SUBDIR   := libgcrypt-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgcrypt-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
--- a/src/libgpg_error.mk	Wed Jan 04 08:32:16 2017 -0500
+++ b/src/libgpg_error.mk	Wed Jan 04 08:32:17 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.19
-$(PKG)_CHECKSUM := 4997951ab058788de48b989013668eb3df1e6939
+$(PKG)_VERSION  := 1.26
+$(PKG)_CHECKSUM := 9a926e7ee6309e539313443555535d49a2a5c9f1
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
--- a/src/mingw-libgcrypt-1-fixes.patch	Wed Jan 04 08:32:16 2017 -0500
+++ b/src/mingw-libgcrypt-1-fixes.patch	Wed Jan 04 08:32:17 2017 -0500
@@ -1,23 +1,208 @@
-From http://lists.freedesktop.org/archives/gstreamer-commits/2014-February/077094.html
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 6e118d36f8c15474065fe357446cf288cdc1e179 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Thu, 4 Dec 2014 15:07:43 +1100
+Subject: [PATCH 1/3] fix for mingw cross building
+
+Taken from:
+https://aur.archlinux.org/packages/mingw-w64-libgcrypt/
 
-diff -ur libgcrypt-1.6.1.orig/random/rndhw.c libgcrypt-1.6.1/random/rndhw.c
---- libgcrypt-1.6.1.orig/random/rndhw.c	2014-08-16 22:16:09.991066266 -0400
-+++ libgcrypt-1.6.1/random/rndhw.c	2014-08-16 22:19:19.025936274 -0400
-@@ -69,7 +69,7 @@
-   nbytes = 0;
-   while (nbytes < 64)
-     {
--#if defined(__x86_64__) && defined(__LP64__)
-+#if defined(__x86_64__) // && defined(__LP64__)
-       asm volatile
-         ("movq %1, %%rdi\n\t"         /* Set buffer.  */
-          "xorq %%rdx, %%rdx\n\t"      /* Request up to 8 bytes.  */
-@@ -123,7 +123,7 @@
- #ifdef USE_DRNG
- # define RDRAND_RETRY_LOOPS	10
- # define RDRAND_INT	".byte 0x0f,0xc7,0xf0"
--# if defined(__x86_64__) && defined(__LP64__)
-+# if defined(__x86_64__) //&& defined(__LP64__)
- #  define RDRAND_LONG	".byte 0x48,0x0f,0xc7,0xf0"
- # else
- #  define RDRAND_LONG	RDRAND_INT
+diff --git a/acinclude.m4 b/acinclude.m4
+index 96be833..9e14e12 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
+ [tmp_do_check="no"
+ case "${host}" in
+     i?86-mingw32* | i?86-*-mingw32*)
+-        ac_cv_sys_symbol_underscore=yes
++        if test "x$ac_cv_sys_symbol_underscore" = x ; then
++           ac_cv_sys_symbol_underscore=yes
++        fi
+         ;;
+     x86_64-*-mingw32*)
+         ac_cv_sys_symbol_underscore=no
+diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h
+index e607806..4c57111 100644
+--- a/mpi/generic/mpi-asm-defs.h
++++ b/mpi/generic/mpi-asm-defs.h
+@@ -4,5 +4,9 @@
+ #if __GNUC__ >= 3 && defined(__x86_64__) && defined(__ILP32__)
+ #define BYTES_PER_MPI_LIMB 8
+ #else
++#ifdef _WIN64
++#define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG_LONG)
++#else
+ #define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
+ #endif
++#endif
+diff --git a/mpi/mpi-internal.h b/mpi/mpi-internal.h
+index 898ca47..afd1a1f 100644
+--- a/mpi/mpi-internal.h
++++ b/mpi/mpi-internal.h
+@@ -169,6 +169,12 @@ typedef int mpi_size_t;        /* (must be a signed type) */
+     } while (0)
+ 
+ 
++#ifdef _WIN64
++#define ATTR_ABI __attribute__ ((sysv_abi))
++#else
++#define ATTR_ABI
++#endif
++
+ /*-- mpiutil.c --*/
+ #define mpi_alloc_limb_space(n,f)  _gcry_mpi_alloc_limb_space((n),(f))
+ mpi_ptr_t _gcry_mpi_alloc_limb_space( unsigned nlimbs, int sec );
+@@ -187,7 +193,7 @@ void _gcry_mpi_lshift_limbs( gcry_mpi_t a, unsigned int count );
+ mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			  mpi_ptr_t s2_ptr,  mpi_size_t size);
++			  mpi_ptr_t s2_ptr,  mpi_size_t size) ATTR_ABI;
+ mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+@@ -195,7 +201,7 @@ mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_siz
+ mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+ 			  mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			  mpi_ptr_t s2_ptr, mpi_size_t size);
++			  mpi_ptr_t s2_ptr, mpi_size_t size) ATTR_ABI;
+ mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+@@ -217,9 +223,9 @@ struct karatsuba_ctx {
+ void _gcry_mpih_release_karatsuba_ctx( struct karatsuba_ctx *ctx );
+ 
+ mpi_limb_t _gcry_mpih_addmul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			     mpi_size_t s1_size, mpi_limb_t s2_limb);
++			     mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
+ mpi_limb_t _gcry_mpih_submul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			     mpi_size_t s1_size, mpi_limb_t s2_limb);
++			     mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
+ void _gcry_mpih_mul_n( mpi_ptr_t prodp, mpi_ptr_t up, mpi_ptr_t vp,
+ 						   mpi_size_t size);
+ mpi_limb_t _gcry_mpih_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
+@@ -236,7 +242,7 @@ void _gcry_mpih_mul_karatsuba_case( mpi_ptr_t prodp,
+ 
+ /*-- mpih-mul_1.c (or xxx/cpu/ *.S) --*/
+ mpi_limb_t _gcry_mpih_mul_1( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-			  mpi_size_t s1_size, mpi_limb_t s2_limb);
++			  mpi_size_t s1_size, mpi_limb_t s2_limb) ATTR_ABI;
+ 
+ /*-- mpih-div.c --*/
+ mpi_limb_t _gcry_mpih_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
+@@ -250,9 +256,9 @@ mpi_limb_t _gcry_mpih_divmod_1( mpi_ptr_t quot_ptr,
+ 
+ /*-- mpih-shift.c --*/
+ mpi_limb_t _gcry_mpih_lshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
+-							   unsigned cnt);
++							   unsigned cnt) ATTR_ABI;
+ mpi_limb_t _gcry_mpih_rshift( mpi_ptr_t wp, mpi_ptr_t up, mpi_size_t usize,
+-							   unsigned cnt);
++							   unsigned cnt) ATTR_ABI;
+ 
+ 
+ /* Define stuff for longlong.h.  */
+diff --git a/src/libgcrypt.def b/src/libgcrypt.def
+index 067cb84..df71bba 100644
+--- a/src/libgcrypt.def
++++ b/src/libgcrypt.def
+@@ -1,3 +1,4 @@
++EXPORTS
+ ;; libgcrypt.defs -  Exported symbols for W32
+ ;; Copyright (C) 2003, 2007 Free Software Foundation, Inc.
+ ;;
+@@ -22,7 +23,6 @@
+ ;; never be changed.  Also check libgcrypt.vers and visibility.h.
+ 
+ 
+-EXPORTS
+       gcry_check_version  @1
+       gcry_control  @2
+ 
+-- 
+2.7.4
+
+
+From 9ff9c0ae66b9f51decfda8dffa2024d8dbaa9fe6 Mon Sep 17 00:00:00 2001
+From: Saikrishna Arcot <saiarcot895@gmail.com>
+Date: Fri, 12 Jun 2015 14:53:55 -0700
+Subject: [PATCH 2/3] Don't call git to determine the revision.
+
+
+diff --git a/configure.ac b/configure.ac
+index f683e21..d43c012 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [0])
+ # processing is done by autoconf and not during the configure run.
+ m4_define(mym4_version,
+           [mym4_version_major.mym4_version_minor.mym4_version_micro])
+-m4_define([mym4_revision],
+-          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
++m4_define([mym4_revision], [4091])
+ m4_define([mym4_revision_dec],
+           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
+-m4_define([mym4_betastring],
+-          m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
+-                        awk -F- '$3!=0{print"-beta"$3}']))
++m4_define([mym4_betastring], [])
+ m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+ 
+-- 
+2.7.4
+
+
+From 7a22846e84ca5047b2f5cae7eb12ccab53c03026 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sun, 28 Jun 2015 17:17:25 +0200
+Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12
+
+Earlier versions of automake complain if they get a configuration
+parameter which they don't understand.  The error is:
+
+configure.ac:27: error: option 'serial-tests' not recognized
+
+Use some m4 hackery to work around this.
+
+Fix libgcrypt build under x86_64
+See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html
+
+diff --git a/configure.ac b/configure.ac
+index d43c012..b6f20ae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION
+ 
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_SRCDIR([src/libgcrypt.vers])
+-AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
++
++dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
++dnl gives an error if it sees this, but for automake >= 1.13
++dnl serial-tests is required so we have to include it.  Solution is to
++dnl test for the version of automake (by running an external command)
++dnl and provide it if necessary.  Note we have to do this entirely using
++dnl m4 macros since automake queries this macro by running
++dnl 'autoconf --trace ...'.
++m4_define([serial_tests], [
++    m4_esyscmd([automake --version |
++                head -1 |
++                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\
++                    'print "serial-tests" }}'
++    ])
++])
++dnl NB: Do not [quote] this parameter.
++AM_INIT_AUTOMAKE(serial_tests dist-bzip2)
++
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([compat])
+-- 
+2.7.4
+