[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.6-1
Guido Günther
agx at sigxcpu.org
Mon Sep 26 21:57:38 UTC 2011
The following commit has been merged in the master branch:
commit f759960c284d41e419f6b55bc882492a84e5fda2
Author: Guido Günther <agx at sigxcpu.org>
Date: Mon Sep 26 23:01:28 2011 +0200
Rediff remaining patches
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
index 1460243..5579682 100644
--- 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
@@ -13,10 +13,10 @@ Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573172
2 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 41b691a..ffe49c3 100644
+index 88dc2a4..f08846f 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
-@@ -628,9 +628,26 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -632,9 +632,26 @@ int virNetSocketNewConnectSSH(const char *nodename,
"-e", "none", NULL);
if (noVerify)
virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
@@ -47,7 +47,7 @@ index 41b691a..ffe49c3 100644
return virNetSocketNewConnectCommand(cmd, retsock);
}
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index e72b9a0..3816b3c 100644
+index fae15a3..b3a2705 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -496,7 +496,7 @@ mymain(void)
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 8e9c8c6..0151a7d 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,7 +8,7 @@ until we debugged the interaction with pbuilder
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index 3816b3c..319dbc0 100644
+index b3a2705..f6da0b8 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -488,10 +488,12 @@ mymain(void)
diff --git a/debian/patches/allow-libvirt-group-to-access-the-socket.patch b/debian/patches/allow-libvirt-group-to-access-the-socket.patch
index 444f326..296e909 100644
--- a/debian/patches/allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/allow-libvirt-group-to-access-the-socket.patch
@@ -8,7 +8,7 @@ Subject: allow libvirt group to access the socket
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 95e43dd..8876ce7 100644
+index da3983e..7cfb324 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
diff --git a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
index dbe0da4..64df645 100644
--- a/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/fix-Debian-specific-path-to-hvm-loader.patch
@@ -12,10 +12,10 @@ Closes: #517059
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 0309d8a..8c50f20 100644
+index 77085c9..efe1f10 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2341,7 +2341,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2317,7 +2317,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 4754d6f..d86b861 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,12 +42,12 @@ to savely detect that the command 'info migrate' is not implemented.
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 84941f9..635cf93 100644
+index cedf582..a32cb66 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1259,7 +1259,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
- *total *= 1024;
-
+@@ -1491,7 +1491,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+ }
+ *total += disk_total * 1024;
}
- }
+ } else if (strstr(reply, "info migration") != NULL) {
diff --git a/debian/patches/qemu-disable-network.diff.patch b/debian/patches/qemu-disable-network.diff.patch
index f54fab2..cce16ad 100644
--- a/debian/patches/qemu-disable-network.diff.patch
+++ b/debian/patches/qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: qemu-disable-network.diff
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 46b92a8..0125489 100644
+index 738ee91..b1c25a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1432,9 +1432,6 @@ if WITH_NETWORK
+@@ -1501,9 +1501,6 @@ if WITH_NETWORK
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -22,10 +22,10 @@ index 46b92a8..0125489 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index 8bcf3b5..0e86d15 100644
+index b421da7..2a8066e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -6352,9 +6352,6 @@ install-data-local:
+@@ -6585,9 +6585,6 @@ install-data-local:
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/remove-RHism.diff.patch b/debian/patches/remove-RHism.diff.patch
index 155768b..50a6c33 100644
--- a/debian/patches/remove-RHism.diff.patch
+++ b/debian/patches/remove-RHism.diff.patch
@@ -7,10 +7,10 @@ Subject: remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 5b7fa9c..b995837 100644
+index 88dee26..8a2fa3f 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
-@@ -97,7 +97,7 @@ Output elapsed time information for each command.
+@@ -98,7 +98,7 @@ Output elapsed time information for each command.
Most B<virsh> operations rely upon the libvirt library being able to
connect to an already running libvirtd service. This can usually be
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index 9493e0a..8cea61b 100644
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
@@ -1,4 +1,5 @@
-From: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
+From: Debian Libvirt Maintainers
+ <pkg-libvirt-maintainers at lists.alioth.debian.org>
Date: Mon, 11 Apr 2011 23:31:09 +0200
Subject: virsh: Initialize library before calling virResetLastError
@@ -25,10 +26,10 @@ Otherwise this results in crashes like:
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
-index f2fd9e5..39d41a1 100644
+index e5ea9d7..5bf4551 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
-@@ -14340,6 +14340,9 @@ vshInit(vshControl *ctl)
+@@ -15501,6 +15501,9 @@ vshInit(vshControl *ctl)
/* set up the signals handlers to catch disconnections */
vshSetupSignals();
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list