[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.7-3

[Guido Günther]

The following commit has been merged in the master branch:
commit e6c518485f8931e2edff28c19056cd19d7e8956e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Feb 18 15:48:52 2011 +0100

    New patch Don-t-pass-empty-arguments-to-dnsmasq.patch
    
    Don't pass empty arguments to dnsmasq
    
    Thanks: Simon McVittie for the detailed description
    Closes: #613944

diff --git a/debian/patches/Don-t-pass-empty-arguments-to-dnsmasq.patch b/debian/patches/Don-t-pass-empty-arguments-to-dnsmasq.patch
new file mode 100644
index 0000000..ea0dd45
--- /dev/null
+++ b/debian/patches/Don-t-pass-empty-arguments-to-dnsmasq.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Fri, 18 Feb 2011 15:47:48 +0100
+Subject: Don't pass empty arguments to dnsmasq
+
+unbreaks dnsmasq >= 2.56
+---
+ src/network/bridge_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 7d43ef5..8499ae4 100644
+--- a/src/network/bridge_driver.c
++++ b/src/network/bridge_driver.c
+@@ -466,7 +466,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network,
+     virCommandAddArgPair(cmd, "--pid-file", pidfile);
+ 
+     /* *no* conf file */
+-    virCommandAddArgList(cmd, "--conf-file=", "", NULL);
++    virCommandAddArgList(cmd, "--conf-file=", NULL);
+ 
+     /*
+      * XXX does not actually work, due to some kind of
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c6e7ab5..81b128d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ Disable-CHECKSUM-rule.patch
 libvirt-guests-remove-bashisms.patch
 build-let-xgettext-see-strings-in-libvirt-guests.patch
 Debianize-libvirt-guests.patch
+Don-t-pass-empty-arguments-to-dnsmasq.patch

-- 
Libvirt Debian packaging