update to 1.6.3

6 files changed, 207 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..c94355ec8dce
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,25 @@
+pkgbase = mingw-w64-libgcrypt
+	pkgdesc = General purpose cryptographic library based on the code from GnuPG (mingw-w64)
+	pkgver = 1.6.3
+	pkgrel = 1
+	url = http://www.gnupg.org
+	arch = any
+	license = LGPL
+	makedepends = mingw-w64-configure
+	makedepends = transfig
+	makedepends = ghostscript
+	depends = mingw-w64-libgpg-error
+	options = staticlibs
+	options = !buildflags
+	options = !strip
+	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.3.tar.bz2
+	source = libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+	source = libgcrypt-use-correct-def-file.patch
+	source = libgcrypt-use-correct-asm-code-for-win64.patch
+	md5sums = 4262c3aadf837500756c2051a5c4ae5e
+	md5sums = 7bb247584a66a83677c618aec812ca9b
+	md5sums = 531e089caca74b5daf130b7173c2a5c5
+	md5sums = ccdd21fdd8b28690ed7e736a77606735
+
+pkgname = mingw-w64-libgcrypt
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..79ffea0ccae6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.bz2
+*.xz
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..5ee14775ffa6
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,58 @@
+pkgname=mingw-w64-libgcrypt
+pkgver=1.6.3
+pkgrel=1
+pkgdesc="General purpose cryptographic library based on the code from GnuPG (mingw-w64)"
+arch=("any")
+url="http://www.gnupg.org"
+license=("LGPL")
+depends=(mingw-w64-libgpg-error)
+makedepends=(mingw-w64-configure transfig ghostscript)
+options=(staticlibs !buildflags !strip)
+source=("ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"
+"libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch"
+"libgcrypt-use-correct-def-file.patch"
+"libgcrypt-use-correct-asm-code-for-win64.patch")
+md5sums=('4262c3aadf837500756c2051a5c4ae5e'
+         '7bb247584a66a83677c618aec812ca9b'
+         '531e089caca74b5daf130b7173c2a5c5'
+         'ccdd21fdd8b28690ed7e736a77606735')
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "${srcdir}/libgcrypt-${pkgver}"
+  patch -p0 -i "$srcdir"/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
+  patch -p0 -i "$srcdir"/libgcrypt-use-correct-def-file.patch
+  patch -p1 -i "$srcdir"/libgcrypt-use-correct-asm-code-for-win64.patch
+  autoreconf -vfi
+}
+
+build() {
+  cd "${srcdir}/libgcrypt-${pkgver}"
+  unset LDFLAGS
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    configure_args=""
+    if test "${_arch}" = "x86_64-w64-mingw32"
+    then
+      configure_args="ac_cv_sys_symbol_underscore=no --disable-padlock-support"
+    fi
+    ${_arch}-configure \
+      --enable-pubkey-ciphers='dsa elgamal rsa ecc' \
+      --with-gpg-error-prefix=/usr/${_arch} $configure_args
+    make
+    popd
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    cd "$srcdir/libgcrypt-${pkgver}/build-${_arch}"
+    make DESTDIR="$pkgdir" install -j1 
+    rm -r "$pkgdir"/usr/${_arch}/share
+    rm "$pkgdir"/usr/${_arch}/bin/*.exe
+    rm "$pkgdir"/usr/${_arch}/lib/*.def
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+  done
+}
+
diff --git a/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
new file mode 100644
index 000000000000..86924eb4832e
--- /dev/null
+++ b/libgcrypt-mingw64-use-correct-datatype-for-GetProcessWorkingSet.patch
@@ -0,0 +1,11 @@
+--- random/rndw32.c.orig	2011-07-04 19:11:18.137525831 +0200
++++ random/rndw32.c	2011-07-04 19:11:40.785404249 +0200
+@@ -887,7 +887,7 @@
+   {
+     HANDLE handle;
+     FILETIME creationTime, exitTime, kernelTime, userTime;
+-    DWORD minimumWorkingSetSize, maximumWorkingSetSize;
++    SIZE_T minimumWorkingSetSize, maximumWorkingSetSize;
+ 
+     handle = GetCurrentThread ();
+     GetThreadTimes (handle, &creationTime, &exitTime,
diff --git a/libgcrypt-use-correct-asm-code-for-win64.patch b/libgcrypt-use-correct-asm-code-for-win64.patch
new file mode 100644
index 000000000000..b5309eaa2d98
--- /dev/null
+++ b/libgcrypt-use-correct-asm-code-for-win64.patch
@@ -0,0 +1,94 @@
+diff -ur libgcrypt-1.6.2/acinclude.m4 libgcrypt-1.6.2.new/acinclude.m4
+--- libgcrypt-1.6.2/acinclude.m4	2014-08-18 08:46:51.000000000 +0200
++++ libgcrypt-1.6.2.new/acinclude.m4	2014-11-07 21:48:36.315702591 +0100
+@@ -102,7 +102,9 @@
+ [tmp_do_check="no"
+ case "${host}" in
+     *-mingw32*)
+-        ac_cv_sys_symbol_underscore=yes
++        if test "x$ac_cv_sys_symbol_underscore" = x ; then
++           ac_cv_sys_symbol_underscore=yes
++        fi
+         ;;
+     i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
+         ac_cv_sys_symbol_underscore=yes
+diff -ur libgcrypt-1.6.2/mpi/generic/mpi-asm-defs.h libgcrypt-1.6.2.new/mpi/generic/mpi-asm-defs.h
+--- libgcrypt-1.6.2/mpi/generic/mpi-asm-defs.h	2014-08-18 08:46:51.000000000 +0200
++++ libgcrypt-1.6.2.new/mpi/generic/mpi-asm-defs.h	2014-11-07 21:47:30.932355415 +0100
+@@ -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 -ur libgcrypt-1.6.2/mpi/mpi-internal.h libgcrypt-1.6.2.new/mpi/mpi-internal.h
+--- libgcrypt-1.6.2/mpi/mpi-internal.h	2014-08-18 08:46:51.000000000 +0200
++++ libgcrypt-1.6.2.new/mpi/mpi-internal.h	2014-11-07 21:46:02.009004456 +0100
+@@ -169,6 +169,12 @@
+     } 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 @@
+ 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_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 @@
+ 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 @@
+ 
+ /*-- 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 @@
+ 
+ /*-- 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/libgcrypt-use-correct-def-file.patch b/libgcrypt-use-correct-def-file.patch
new file mode 100644
index 000000000000..86fd86d75875
--- /dev/null
+++ b/libgcrypt-use-correct-def-file.patch
@@ -0,0 +1,15 @@
+--- src/libgcrypt.def.orig	2012-02-28 00:16:33.422552508 +0100
++++ src/libgcrypt.def	2012-02-28 00:16:59.188018940 +0100
+@@ -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
+