From c3f08472fa832ea121d17a47a1b259c8bdd5e082 Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com>
Date: Fri, 8 Jan 2021 14:07:49 -0800
Subject: [PATCH] libssh2: autoreconf for libtool linking of dll

Patch configure.ac to fix error trying to undefine an undefined macro.
---
 mingw-w64-libssh2/PKGBUILD               | 10 +++++++---
 mingw-w64-libssh2/fix-configure-ac.patch | 11 +++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-libssh2/fix-configure-ac.patch

diff --git a/mingw-w64-libssh2/PKGBUILD b/mingw-w64-libssh2/PKGBUILD
index 6c2b373c46..23352a206d 100644
--- a/mingw-w64-libssh2/PKGBUILD
+++ b/mingw-w64-libssh2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libssh2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -16,13 +16,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-openssl"
          "${MINGW_PACKAGE_PREFIX}-zlib")
 options=('staticlibs' 'strip')
 source=("${url}/download/${_realname}-${pkgver}.tar.gz"
-        fix-pkgconfig.patch)
+        fix-pkgconfig.patch
+        fix-configure-ac.patch)
 sha256sums=('d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd'
-            '7a6545f6d457ad008aacefe04a60727c02d33927c8a903745bf191f69cc8ba55')
+            '7a6545f6d457ad008aacefe04a60727c02d33927c8a903745bf191f69cc8ba55'
+            '956b2518618646f9134f0eee7c539ebfb3ddeeff48019831b53997464edbf4f1')
 
 prepare() {
   cd ${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/fix-pkgconfig.patch
+  patch -p1 -i ${srcdir}/fix-configure-ac.patch
+  autoreconf -fi
 }
 
 build() {
diff --git a/mingw-w64-libssh2/fix-configure-ac.patch b/mingw-w64-libssh2/fix-configure-ac.patch
new file mode 100644
index 0000000000..c443f04ab0
--- /dev/null
+++ b/mingw-w64-libssh2/fix-configure-ac.patch
@@ -0,0 +1,11 @@
+--- libssh2-1.9.0/configure.ac.ORIG	2021-04-12 11:23:19.331827300 -0700
++++ libssh2-1.9.0/configure.ac	2021-04-12 11:23:59.738111400 -0700
+@@ -127,8 +127,6 @@
+ m4_set_foreach([crypto_backends], [backend],
+   [AM_CONDITIONAL(m4_toupper(backend), test "$found_crypto" = "backend")]
+ )
+-m4_undefine([backend])
+-
+ 
+ # libz
+