[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.6-2-9-ge975aa5

[Guido Günther]

The following commit has been merged in the experimental branch:
commit a5d03181e0eaf7ab34ceebc30a6bea7c2cc74e32
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Nov 1 19:00:49 2011 +0100

    Drop Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
    
    fixed upstream.

diff --git a/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch b/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
deleted file mode 100644
index 5579682..0000000
--- a/debian/patches/Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 8 Jul 2011 21:07:29 +0200
-Subject: Autodetect if the remote nc command supports the -q option
-
-Based on a patch by Marc Deslauriers <marc.deslauriers at ubuntu.com>
-
-RH: https://bugzilla.redhat.com/show_bug.cgi?id=562176
-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/517478
-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573172
----
- src/rpc/virnetsocket.c   |   23 ++++++++++++++++++++---
- tests/virnetsockettest.c |   11 ++++++-----
- 2 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 88dc2a4..f08846f 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -632,9 +632,26 @@ int virNetSocketNewConnectSSH(const char *nodename,
-                              "-e", "none", NULL);
-     if (noVerify)
-         virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
--    virCommandAddArgList(cmd, nodename,
--                         netcat ? netcat : "nc",
--                         "-U", path, NULL);
-+
-+    virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
-+    /*
-+     * This ugly thing is a shell script to detect availability of
-+     * the -q option for 'nc': debian and suse based distros need this
-+     * flag to ensure the remote nc will exit on EOF, so it will go away
-+     * when we close the connection tunnel. If it doesn't go away, subsequent
-+     * connection attempts will hang.
-+     *
-+     * Fedora's 'nc' doesn't have this option, and defaults to the desired
-+     * behavior.
-+     */
-+    virCommandAddArgFormat(cmd,
-+         "'if %s -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then"
-+         "     ARG=-q0;"
-+         "fi;"
-+         "%s $ARG -U %s'",
-+         netcat ? netcat : "nc",
-+         netcat ? netcat : "nc",
-+         path);
- 
-     return virNetSocketNewConnectCommand(cmd, retsock);
- }
-diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index fae15a3..b3a2705 100644
---- a/tests/virnetsockettest.c
-+++ b/tests/virnetsockettest.c
-@@ -496,7 +496,7 @@ mymain(void)
-     struct testSSHData sshData1 = {
-         .nodename = "somehost",
-         .path = "/tmp/socket",
--        .expectOut = "somehost nc -U /tmp/socket\n",
-+        .expectOut = "somehost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then     ARG=-q0;fi;nc $ARG -U /tmp/socket'\n",
-     };
-     if (virtTestRun("SSH test 1", 1, testSocketSSH, &sshData1) < 0)
-         ret = -1;
-@@ -509,7 +509,7 @@ mymain(void)
-         .noTTY = true,
-         .noVerify = false,
-         .path = "/tmp/socket",
--        .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost netcat -U /tmp/socket\n",
-+        .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then     ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n",
-     };
-     if (virtTestRun("SSH test 2", 1, testSocketSSH, &sshData2) < 0)
-         ret = -1;
-@@ -522,7 +522,7 @@ mymain(void)
-         .noTTY = false,
-         .noVerify = true,
-         .path = "/tmp/socket",
--        .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost netcat -U /tmp/socket\n",
-+        .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then     ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n",
-     };
-     if (virtTestRun("SSH test 3", 1, testSocketSSH, &sshData3) < 0)
-         ret = -1;
-@@ -538,7 +538,8 @@ mymain(void)
-     struct testSSHData sshData5 = {
-         .nodename = "crashyhost",
-         .path = "/tmp/socket",
--        .expectOut = "crashyhost nc -U /tmp/socket\n",
-+        .expectOut = "crashyhost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then     ARG=-q0;fi;nc $ARG -U /tmp/socket'\n",
-+
-         .dieEarly = true,
-     };
-     if (virtTestRun("SSH test 5", 1, testSocketSSH, &sshData5) < 0)
-@@ -549,7 +550,7 @@ mymain(void)
-         .path = "/tmp/socket",
-         .keyfile = "/root/.ssh/example_key",
-         .noVerify = true,
--        .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com nc -U /tmp/socket\n",
-+        .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then     ARG=-q0;fi;nc $ARG -U /tmp/socket'\n",
-     };
-     if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0)
-         ret = -1;
--- 

-- 
Libvirt Debian packaging