Merge pull request #149 from git-for-windows/gnupg-2.4.4

gnupg: update to 2.4.4

gnupg/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <[email protected]>
 
 pkgname=gnupg
-pkgver=2.2.42
+pkgver=2.4.4
 pkgrel=1
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 provides=('dirmngr' "gnupg2=${pkgver}")
@@ -47,13 +47,11 @@ depends=('bzip2'
         )
 source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
         'gnupg-2.2.8-msys2.patch'
-        '0001-gnupg-2.2.9-have-drive-letters.patch'
-        '0003-scd-Fix-for-SCARD_IO_REQUEST-structure.patch')
-sha256sums=('9189fbd4ec83ad243a4e499d5cb7fe72e4532176817e5ea880ed36a71dd82557'
+        '0001-gnupg-2.2.9-have-drive-letters.patch')
+sha256sums=('67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6'
             'SKIP'
-            'cb23f1a61fd213c25e85b6ba8afb190b7da14a8cfa59cc56ce82df941db8c3c9'
-            'bf9d6675024fa21003f48fc706a5f80799362b7370db0a6de19be36cf73919a5'
-            'fe8c17bf1ab486f275e270048242d891881f733eda399f4a0acea36033f77df3')
+            '6e6dfa9a64d4986f47dfb6937addb51e2e22f55c762559f104eae5a226bdd43f'
+            'bf9d6675024fa21003f48fc706a5f80799362b7370db0a6de19be36cf73919a5')
 validpgpkeys=('031EC2536E580D8EA286A9F22071B08A33BD3F06'
               'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
               '6DAA6E64A76D2840571B4902528897B826403ADA'
@@ -66,7 +64,6 @@ prepare() {
   sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
   patch -p1 -i ${srcdir}/gnupg-2.2.8-msys2.patch
   patch -p1 -i ${srcdir}/0001-gnupg-2.2.9-have-drive-letters.patch
-  patch -p1 -i ${srcdir}/0003-scd-Fix-for-SCARD_IO_REQUEST-structure.patch
 
   autoreconf -fiv
 

gnupg/gnupg-2.2.8-msys2.patch

@@ -22,16 +22,16 @@ diff -ru gnupg-2.2.8-orig/build-aux/compile gnupg-2.2.8/build-aux/compile
 diff -ru gnupg-2.2.8-orig/build-aux/config.guess gnupg-2.2.8/build-aux/config.guess
 --- gnupg-2.2.8-orig/build-aux/config.guess	2017-08-28 12:22:54.000000000 +0200
 +++ gnupg-2.2.8/build-aux/config.guess	2018-06-20 22:41:49.000540700 +0200
-@@ -891,6 +891,9 @@
+@@ -950,6 +950,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
+ 	GUESS=x86_64-pc-cygwin
+ 	;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;
++	GUESS=x86_64-pc-msys
++	;;
+     prep*:SunOS:5.*:*)
+ 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ 	GUESS=powerpcle-unknown-solaris2$SUN_REL
 diff -ru gnupg-2.2.8-orig/build-aux/config.rpath gnupg-2.2.8/build-aux/config.rpath
 --- gnupg-2.2.8-orig/build-aux/config.rpath	2017-08-28 12:22:54.000000000 +0200
 +++ gnupg-2.2.8/build-aux/config.rpath	2018-06-20 22:44:10.790650700 +0200
@@ -105,15 +105,3 @@ diff -ru gnupg-2.2.8-orig/g10/gpg.c gnupg-2.2.8/g10/gpg.c
  		ret=0;
  	      else
  		perm=1;
-diff -ru gnupg-2.2.8-orig/m4/intl.m4 gnupg-2.2.8/m4/intl.m4
---- gnupg-2.2.8-orig/m4/intl.m4	2017-08-28 12:22:54.000000000 +0200
-+++ gnupg-2.2.8/m4/intl.m4	2018-06-20 22:38:34.133395000 +0200
-@@ -98,7 +98,7 @@
-   dnl    exported variables _also_ in the static library.
-   if test "$enable_shared" = yes; then
-     case "$host_os" in
--      cygwin*) is_woe32dll=yes ;;
-+      cygwin* | msys*) is_woe32dll=yes ;;
-       *) is_woe32dll=no ;;
-     esac
-   else