[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.0-2-1-g72b5cea

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 72b5cea3f62e295e1ae3a11ec29055521d514520
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Wed Apr 21 17:04:43 2010 +0200

    Drop 0005-Terminate-nc-on-EOF.patch.
    
    Since netcat-openbsd 1.89-4 fixes #502188.

diff --git a/debian/control b/debian/control
index 69da0ea..6c1700b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate
 Enhances: qemu, qemu-kvm, xen
 Section: admin
-Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu-kvm | qemu (>= 0.9.1)
+Recommends: netcat-openbsd (>= 1.89-4), bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu-kvm | qemu (>= 0.9.1)
 Suggests: policykit-1
+Conflicts: netcat-openbsd (<< 1.89-4)
 Description: the programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
diff --git a/debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch b/debian/patches/0005-Don-t-drop-caps-when-exec-ing-qemu.patch
similarity index 100%
rename from debian/patches/0006-Don-t-drop-caps-when-exec-ing-qemu.patch
rename to debian/patches/0005-Don-t-drop-caps-when-exec-ing-qemu.patch
diff --git a/debian/patches/0005-Terminate-nc-on-EOF.patch b/debian/patches/0005-Terminate-nc-on-EOF.patch
deleted file mode 100644
index 36de284..0000000
--- a/debian/patches/0005-Terminate-nc-on-EOF.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Gabor Gombas <gombasg at sztaki.hu>
-Date: Fri, 8 Jan 2010 11:00:07 +0100
-Subject: [PATCH] Terminate nc on EOF
-
-Closes: #564053
----
- src/remote/remote_driver.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 751c354..9a48613 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -735,7 +735,7 @@ doRemoteOpen (virConnectPtr conn,
-     }
- 
-     case trans_ssh: {
--        int j, nr_args = 6;
-+        int j, nr_args = 8;
- 
-         if (username) nr_args += 2; /* For -l username */
-         if (no_tty) nr_args += 5;   /* For -T -o BatchMode=yes -e none */
-@@ -769,6 +769,8 @@ doRemoteOpen (virConnectPtr conn,
-         }
-         cmd_argv[j++] = strdup (priv->hostname);
-         cmd_argv[j++] = strdup (netcat ? netcat : "nc");
-+        cmd_argv[j++] = strdup ("-q");
-+        cmd_argv[j++] = strdup ("0");
-         cmd_argv[j++] = strdup ("-U");
-         cmd_argv[j++] = strdup (sockname ? sockname :
-                                 (flags & VIR_CONNECT_RO
--- 
diff --git a/debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch b/debian/patches/0006-nwfilter-Don-t-crash-if-driverState-NULL.patch
similarity index 100%
rename from debian/patches/0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
rename to debian/patches/0006-nwfilter-Don-t-crash-if-driverState-NULL.patch
diff --git a/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch b/debian/patches/0007-Ignore-empty-type-statement-in-disk-element.patch
similarity index 100%
rename from debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch
rename to debian/patches/0007-Ignore-empty-type-statement-in-disk-element.patch
diff --git a/debian/patches/series b/debian/patches/series
index 779562e..a146065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 0002-qemu-disable-network.diff.patch
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
-0005-Terminate-nc-on-EOF.patch
-0006-Don-t-drop-caps-when-exec-ing-qemu.patch
-0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
-0008-Ignore-empty-type-statement-in-disk-element.patch
+0005-Don-t-drop-caps-when-exec-ing-qemu.patch
+0006-nwfilter-Don-t-crash-if-driverState-NULL.patch
+0007-Ignore-empty-type-statement-in-disk-element.patch

-- 
Libvirt Debian packaging