Wed Nov 9 23:14:53 UTC 2011

2 files changed, 23 insertions, 22 deletions

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 2ec0f45c9..069d34cce 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55818 2011-09-22 13:29:51Z spupykin $
+# $Id: PKGBUILD 58183 2011-11-08 12:06:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.6
+pkgver=0.9.7
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
@@ -24,6 +24,7 @@ options=('emptydirs' '!libtool')
 backup=('etc/conf.d/libvirtd'
 	'etc/conf.d/libvirtd-guests'
 	'etc/libvirt/libvirtd.conf'
+	'etc/libvirt/libvirt.conf'
 	'etc/libvirt/qemu.conf'
 	'etc/sasl2/libvirt.conf')
 install="libvirt.install"
@@ -35,12 +36,12 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('b74df374b524d00a22a6c89cfc23099f'
+md5sums=('4308b3f4d23f5b0c5196260a9a22a38b'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '6f36bf189ef0e5847038787d13535420'
          'bc2971dacdbac967fc3474e50affc345'
-         '4a2659d0e06a7af742f71a0a36c7cea3'
+         'b0be50eb9dfe4d133decf23b60880f7d'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index c884d2171..a01b4f14e 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qemu_migration.c
---- libvirt-0.9.5/src/qemu/qemu_migration.c	2011-09-16 16:37:07.000000000 +0400
-+++ libvirt-0.9.5.my/src/qemu/qemu_migration.c	2011-09-20 20:44:39.000000000 +0400
-@@ -1497,7 +1497,7 @@
+diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.7/src/qemu/qemu_migration.c	2011-10-31 07:46:04.000000000 +0400
++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c	2011-11-08 15:46:10.000000000 +0400
+@@ -1589,7 +1589,7 @@
                                             spec->dest.unix_socket.file);
          } else {
              const char *args[] = {
@@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qe
              };
              ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
          }
-diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote/remote_driver.c
---- libvirt-0.9.5/src/remote/remote_driver.c	2011-09-20 07:00:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/remote/remote_driver.c	2011-09-20 20:44:43.000000000 +0400
-@@ -596,7 +596,7 @@
+diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
+--- libvirt-0.9.7/src/remote/remote_driver.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/remote/remote_driver.c	2011-11-08 15:46:10.000000000 +0400
+@@ -614,7 +614,7 @@
                                                  username,
                                                  !tty,
                                                  !verify,
@@ -22,15 +22,15 @@ diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote
                                                  keyfile,
                                                  sockname)))
              goto failed;
-diff -wbBur libvirt-0.9.5/src/rpc/virnetsocket.c libvirt-0.9.5.my/src/rpc/virnetsocket.c
---- libvirt-0.9.5/src/rpc/virnetsocket.c	2011-09-14 06:11:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/rpc/virnetsocket.c	2011-09-20 20:44:33.000000000 +0400
-@@ -633,7 +633,7 @@
-     if (noVerify)
+diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.7/src/rpc/virnetsocket.c	2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c	2011-11-08 15:46:31.000000000 +0400
+@@ -642,7 +642,7 @@
          virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
-     virCommandAddArgList(cmd, nodename,
--                         netcat ? netcat : "nc",
-+                         netcat ? netcat : "nc.openbsd",
-                          "-U", path, NULL);
  
-     return virNetSocketNewConnectCommand(cmd, retsock);
+     if (!netcat)
+-        netcat = "nc";
++        netcat = "nc.openbsd";
+ 
+     virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
+