From e6ac7d60c22d32b8a84cecfd17d1ae93fa2f490d Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Mon, 6 Mar 2017 14:07:07 +0300
Subject: [PATCH] libvirt: Update to 3.1.0

---
 ...ix-not-supported-authenticate-method.patch | 23 +++++++++++++++++++
 mingw-w64-libvirt/PKGBUILD                    | 17 ++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 mingw-w64-libvirt/001-fix-not-supported-authenticate-method.patch

diff --git a/mingw-w64-libvirt/001-fix-not-supported-authenticate-method.patch b/mingw-w64-libvirt/001-fix-not-supported-authenticate-method.patch
new file mode 100644
index 0000000000..83cbcf4ad1
--- /dev/null
+++ b/mingw-w64-libvirt/001-fix-not-supported-authenticate-method.patch
@@ -0,0 +1,23 @@
+--- libvirt-3.1.0/src/rpc/virnetlibsshsession.c.orig	2017-03-06 11:21:02.669718200 +0300
++++ libvirt-3.1.0/src/rpc/virnetlibsshsession.c	2017-03-06 11:39:52.801358100 +0300
+@@ -863,6 +863,7 @@
+             ret = virNetLibsshAuthenticateKeyboardInteractive(sess, auth);
+             break;
+         case VIR_NET_LIBSSH_AUTH_AGENT:
++#ifndef _WIN32
+             /* try to authenticate using ssh-agent */
+             ret = ssh_userauth_agent(sess->session, NULL);
+             if (ret == SSH_AUTH_ERROR) {
+@@ -871,6 +872,12 @@
+                                _("failed to authenticate using agent: %s"),
+                                errmsg);
+             }
++#else
++            /* Windows doesn't support authenticate using ssh-agent */
++            ret = SSH_AUTH_ERROR;
++            errmsg = ssh_get_error(sess->session);
++            virReportError(VIR_ERR_LIBSSH, _("Libssh not support authenticate via ssh-agent on Windows"));
++#endif
+             break;
+         case VIR_NET_LIBSSH_AUTH_PRIVKEY:
+             /* try to authenticate using the provided ssh key */
diff --git a/mingw-w64-libvirt/PKGBUILD b/mingw-w64-libvirt/PKGBUILD
index a085a2db15..4981f81703 100644
--- a/mingw-w64-libvirt/PKGBUILD
+++ b/mingw-w64-libvirt/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libvirt
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.5.0
+pkgver=3.1.0
 pkgrel=1
 pkgdesc="Windows libvirt virtualization library (mingw-w64)"
 arch=('any')
@@ -19,13 +19,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-portablexdr")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=('strip' 'staticlibs')
-source=(https://libvirt.org/sources/${_realname}-${pkgver}.tar.xz)
-sha256sums=('819dffefbfd6ae95dfe1b28cfdee15ebcf9f91bbd732157488a57705bf81cb1e')
+source=(https://libvirt.org/sources/${_realname}-${pkgver}.tar.xz
+        001-fix-not-supported-authenticate-method.patch)
+sha256sums=('7879029a0fcac4e58dbeec66f0bc77771565c4b6667212c8f6251eefb03732a9'
+            '4635fd04e596879186b74ef9ddbacf64f6058e32bfd8d8376e1b7fa7838f679b')
+
+prepare() {
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-fix-not-supported-authenticate-method.patch
+}
 
 build() {
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
-  "${srcdir}"/${_realname}-${pkgver}/configure \
+  ../${_realname}-${pkgver}/configure \
     --enable-shared \
     --enable-static \
     --prefix=${MINGW_PREFIX} \
@@ -57,5 +64,5 @@ build() {
 
 package() {
   cd ${srcdir}/build-${MINGW_CHOST}
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }