From b215b5e985b9310dff8d992510f12a87141fe7cb Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 6 Jul 2011 23:10:44 +0000
Subject: Wed Jul  6 23:10:44 UTC 2011

---
 community/libvirt/PKGBUILD                     |  8 ++---
 community/libvirt/openbsd-netcat-default.patch | 44 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 20 deletions(-)

(limited to 'community/libvirt')

diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 78737f3b2..f9475577e 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 48842 2011-06-06 14:43:46Z spupykin $
+# $Id: PKGBUILD 50988 2011-07-04 11:16:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=0.9.2
+pkgver=0.9.3
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64')
@@ -37,10 +37,10 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	openbsd-netcat-default.patch
 	unixperms.patch
 	yajl-2.x.patch)
-md5sums=('a9f974e173471a9c9b381ad1e93642b0'
+md5sums=('04f47fad7d0c614af9dcc5d1351c2148'
          '018d97dafc0049075fba6f2850f17a12'
          '3ed0e24f5b5e25bf553f5427d64915e6'
-         '1c151434af552b8a30fe87d21ef5d783'
+         'ebb78cda893ca7991e0c22588a63132b'
          'db95aecdf2ccf3693fef5821cdcb7eba'
          '5745bb8d0b254abb7a3528c66e03b0f9')
 
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index 8a0d9aec8..29f05b34f 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.2/src/qemu/qemu_migration.c libvirt-0.9.2.my/src/qemu/qemu_migration.c
---- libvirt-0.9.2/src/qemu/qemu_migration.c	2011-06-06 06:47:32.000000000 +0400
-+++ libvirt-0.9.2.my/src/qemu/qemu_migration.c	2011-06-06 18:27:38.000000000 +0400
-@@ -1770,7 +1770,7 @@
+diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.3/src/qemu/qemu_migration.c	2011-07-04 06:45:14.000000000 +0400
++++ libvirt-0.9.3.my/src/qemu/qemu_migration.c	2011-07-04 15:03:15.000000000 +0400
+@@ -1763,7 +1763,7 @@
          ret = qemuMonitorMigrateToUnix(priv->mon, background_flags,
                                                 unixfile);
      } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) {
@@ -10,15 +10,27 @@ diff -wbBur libvirt-0.9.2/src/qemu/qemu_migration.c libvirt-0.9.2.my/src/qemu/qe
          ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args);
      } else {
          ret = -1;
-diff -wbBur libvirt-0.9.2/src/remote/remote_driver.c libvirt-0.9.2.my/src/remote/remote_driver.c
---- libvirt-0.9.2/src/remote/remote_driver.c	2011-06-06 04:15:12.000000000 +0400
-+++ libvirt-0.9.2.my/src/remote/remote_driver.c	2011-06-06 18:27:52.000000000 +0400
-@@ -774,7 +774,7 @@
-             virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", "-e",
-                                  "none", NULL);
-         }
--        virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc",
-+        virCommandAddArgList(cmd, priv->hostname, netcat ? netcat : "nc.openbsd",
-                              "-U", (sockname ? sockname :
-                                     (flags & VIR_CONNECT_RO
-                                      ? LIBVIRTD_PRIV_UNIX_SOCKET_RO
+diff -wbBur libvirt-0.9.3/src/remote/remote_driver.c libvirt-0.9.3.my/src/remote/remote_driver.c
+--- libvirt-0.9.3/src/remote/remote_driver.c	2011-07-01 10:59:10.000000000 +0400
++++ libvirt-0.9.3.my/src/remote/remote_driver.c	2011-07-04 15:03:32.000000000 +0400
+@@ -571,7 +571,7 @@
+                                                 command,
+                                                 username,
+                                                 no_tty,
+-                                                netcat ? netcat : "nc",
++                                                netcat ? netcat : "nc.openbsd",
+                                                 sockname)))
+             goto failed;
+ 
+diff -wbBur libvirt-0.9.3/src/rpc/virnetsocket.c libvirt-0.9.3.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.3/src/rpc/virnetsocket.c	2011-07-01 10:59:10.000000000 +0400
++++ libvirt-0.9.3.my/src/rpc/virnetsocket.c	2011-07-04 15:03:00.000000000 +0400
+@@ -597,7 +597,7 @@
+         virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes",
+                              "-e", "none", NULL);
+     virCommandAddArgList(cmd, nodename,
+-                         netcat ? netcat : "nc",
++                         netcat ? netcat : "nc.openbsd",
+                          "-U", path, NULL);
+ 
+     return virNetSocketNewConnectCommand(cmd, retsock);
-- 
cgit v1.2.3-54-g00ecf