libvirt: Update to 3.1.0

This commit is contained in:
Alexey Pavlov
2017-03-06 14:07:07 +03:00
parent 8c58e2026a
commit e6ac7d60c2
2 changed files with 35 additions and 5 deletions

View File

@@ -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 */

View File

@@ -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
}