summaryrefslogtreecommitdiff
path: root/community/libvirt/openbsd-netcat-default.patch
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-09-19 11:59:33 -0500
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2011-09-19 11:59:33 -0500
commite40531aab32ff93b1f9da20d8a43a440d8dffaca (patch)
tree837260c74cb8eef56e640ee52b2e329e13719276 /community/libvirt/openbsd-netcat-default.patch
parent6fab33c9210eaa90d0a0179f7e49c339ea88990f (diff)
parent171f25215eee368fe64f1eed02ce49de090f4b0d (diff)
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'community/libvirt/openbsd-netcat-default.patch')
-rw-r--r--community/libvirt/openbsd-netcat-default.patch36
1 files changed, 18 insertions, 18 deletions
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);
+