From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Feb 2013 01:12:52 -0800 Subject: Sun Feb 10 01:12:35 PST 2013 --- community/libvirt/openbsd-netcat-default.patch | 60 -------------------------- 1 file changed, 60 deletions(-) delete mode 100644 community/libvirt/openbsd-netcat-default.patch (limited to 'community/libvirt/openbsd-netcat-default.patch') diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch deleted file mode 100644 index 5538c892d..000000000 --- a/community/libvirt/openbsd-netcat-default.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c ---- libvirt-0.10.0.org/src/qemu/qemu_migration.c 2012-08-27 06:12:21.000000000 +0400 -+++ libvirt-0.10.0/src/qemu/qemu_migration.c 2012-08-29 13:36:23.000000000 +0400 -@@ -1910,7 +1910,7 @@ - spec->dest.unix_socket.file); - } else { - const char *args[] = { -- "nc", "-U", spec->dest.unix_socket.file, NULL -+ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL - }; - ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); - } -diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c ---- libvirt-0.10.0.org/src/remote/remote_driver.c 2012-08-27 06:12:21.000000000 +0400 -+++ libvirt-0.10.0/src/remote/remote_driver.c 2012-08-29 13:36:32.000000000 +0400 -@@ -693,7 +693,7 @@ - username, - !tty, - !verify, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - keyfile, - sockname))) - goto failed; -diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c ---- libvirt-0.10.0.org/src/rpc/virnetclient.c 2012-08-28 07:44:50.000000000 +0400 -+++ libvirt-0.10.0/src/rpc/virnetclient.c 2012-08-29 13:36:38.000000000 +0400 -@@ -469,7 +469,7 @@ - DEFAULT_VALUE(host, "localhost"); - DEFAULT_VALUE(port, "22"); - DEFAULT_VALUE(username, "root"); -- DEFAULT_VALUE(netcatPath, "nc"); -+ DEFAULT_VALUE(netcatPath, "nc.openbsd"); - DEFAULT_VALUE(knownHostsVerify, "normal"); - - virBufferEscapeShell(&buf, netcatPath); -diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c ---- libvirt-0.10.0.org/src/rpc/virnetsocket.c 2012-08-22 14:00:59.000000000 +0400 -+++ libvirt-0.10.0/src/rpc/virnetsocket.c 2012-08-29 13:36:44.000000000 +0400 -@@ -698,7 +698,7 @@ - virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - - if (!netcat) -- netcat = "nc"; -+ netcat = "nc.openbsd"; - - virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); - -diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c ---- libvirt-0.10.0.org/tests/virnetsockettest.c 2012-08-10 06:26:04.000000000 +0400 -+++ libvirt-0.10.0/tests/virnetsockettest.c 2012-08-29 13:36:53.000000000 +0400 -@@ -593,7 +593,7 @@ - - struct testSSHData sshData7 = { - .nodename = "somehost", -- .netcat = "nc -4", -+ .netcat = "nc.openbsd -4", - .path = "/tmp/socket", - .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" -- cgit v1.2.3-54-g00ecf