update to 1.8.3

3 files changed, 17 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a00dc4f88ecc..fe073f129794 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,25 @@
-# Generated by mksrcinfo v8
-# Wed Aug  2 00:11:32 UTC 2017
 pkgbase = mingw-w64-libgcrypt
 	pkgdesc = General purpose cryptographic library based on the code from GnuPG (mingw-w64)
-	pkgver = 1.8.0
+	pkgver = 1.8.3
 	pkgrel = 1
 	url = http://www.gnupg.org
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-configure
-	makedepends = fig2dev
-	makedepends = ghostscript
 	depends = mingw-w64-libgpg-error
 	options = staticlibs
 	options = !buildflags
 	options = !strip
 	options = !emptydirs
-	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.8.0.tar.bz2
-	source = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.8.0.tar.bz2.sig
+	source = https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.3.tar.bz2
+	source = https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.3.tar.bz2.sig
 	source = libgcrypt-use-correct-def-file.patch
 	source = Smarter-fig2dev-detection.all.patch
-	sha1sums = b4ffb20369f2ab8249d5cc0fb8b3b31371f6b112
+	validpgpkeys = 031EC2536E580D8EA286A9F22071B08A33BD3F06
+	validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
+	sha1sums = 13bd2ce69e59ab538e959911dfae80ea309636e3
 	sha1sums = SKIP
-	sha1sums = ccd4860aabc08793174376cffa357a7d094ae451
+	sha1sums = 0f03d59dee4b967dfa80621ef4b1efea61772c16
 	sha1sums = 3613a5454aeaef8d264011f2bc9f2303248fb933
 
 pkgname = mingw-w64-libgcrypt
diff --git a/PKGBUILD b/PKGBUILD
index 8fe8dae849f8..e7dc12ab24f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 pkgname=mingw-w64-libgcrypt
-pkgver=1.8.0
+pkgver=1.8.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 fig2dev ghostscript)
+depends=('mingw-w64-libgpg-error')
+makedepends=('mingw-w64-configure')
 options=(staticlibs !buildflags !strip !emptydirs)
-source=("ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"{,.sig}
+source=("https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${pkgver}.tar.bz2"{,.sig}
 "libgcrypt-use-correct-def-file.patch"
 "Smarter-fig2dev-detection.all.patch")
-sha1sums=('b4ffb20369f2ab8249d5cc0fb8b3b31371f6b112'
+sha1sums=('13bd2ce69e59ab538e959911dfae80ea309636e3'
           'SKIP'
-          'ccd4860aabc08793174376cffa357a7d094ae451'
+          '0f03d59dee4b967dfa80621ef4b1efea61772c16'
           '3613a5454aeaef8d264011f2bc9f2303248fb933')
 validpgpkeys=('031EC2536E580D8EA286A9F22071B08A33BD3F06' # "NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org>"
               'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6') # Werner Koch
@@ -21,7 +21,7 @@ _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/libgcrypt-${pkgver}"
-  patch -p0 -i "$srcdir"/libgcrypt-use-correct-def-file.patch
+  patch -p1 -i "$srcdir"/libgcrypt-use-correct-def-file.patch
   patch -p1 -i "${srcdir}"/Smarter-fig2dev-detection.all.patch
   autoreconf -fi
 }
@@ -32,8 +32,7 @@ build() {
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-configure \
-      --with-gpg-error-prefix=/usr/${_arch} \
-      --disable-padlock-support
+      --with-gpg-error-prefix=/usr/${_arch}
     make
     popd
   done
@@ -49,4 +48,3 @@ package() {
     rm "$pkgdir/usr/${_arch}/share/info/dir"
   done
 }
-
diff --git a/libgcrypt-use-correct-def-file.patch b/libgcrypt-use-correct-def-file.patch
index 86fd86d75875..7167416a4054 100644
--- a/libgcrypt-use-correct-def-file.patch
+++ b/libgcrypt-use-correct-def-file.patch
@@ -1,5 +1,5 @@
---- src/libgcrypt.def.orig	2012-02-28 00:16:33.422552508 +0100
-+++ src/libgcrypt.def	2012-02-28 00:16:59.188018940 +0100
+--- a/src/libgcrypt.def.orig	2012-02-28 00:16:33.422552508 +0100
++++ b/src/libgcrypt.def	2012-02-28 00:16:59.188018940 +0100
 @@ -1,3 +1,4 @@
 +EXPORTS
  ;; libgcrypt.defs -  Exported symbols for W32