[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.8_rc1-1
Guido Günther
agx at sigxcpu.org
Sat Dec 3 14:34:31 UTC 2011
The following commit has been merged in the experimental branch:
commit 0c2afdbb3b884745d34dad9df9976187f3134753
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat Dec 3 13:40:31 2011 +0100
Rediff remaining patches
diff --git a/debian/patches/Disable-daemon-start-test.patch b/debian/patches/Disable-daemon-start-test.patch
index bcc4bd3..a184e06 100644
--- a/debian/patches/Disable-daemon-start-test.patch
+++ b/debian/patches/Disable-daemon-start-test.patch
@@ -30,4 +30,3 @@ index 6aa3269..4dac92e 100755
test_final $i $fail
# "cat log" would print this for non-root:
---
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 8c9cd46..f9740a9 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,10 +8,10 @@ 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 a76e5cc..b271ec4 100644
+index 44d6f65..bcfcbd3 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
-@@ -496,10 +496,12 @@ mymain(void)
+@@ -491,10 +491,12 @@ mymain(void)
if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
ret = -1;
@@ -24,4 +24,3 @@ index a76e5cc..b271ec4 100644
struct testSSHData sshData1 = {
.nodename = "somehost",
---
diff --git a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
index 771223a..64f6968 100644
--- a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+++ b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
@@ -23,4 +23,3 @@ index dd692be..9690791 100755
# Note: This test fails on Cygwin 1.5.x, because the non-blocking flag has
# apparently no effect on STDOUT_FILENO. It is fixed in Cygwin 1.7.
---
diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index c808e26..c575ad3 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/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 da3983e..7cfb324 100644
+index f218454..bb3efd1 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
@@ -65,4 +65,3 @@ index f2b513d..6aa3269 100755
&& { echo "$0: found unexpected lines (above) in $conf" 1>&2; exit 1; }
# Start with the sample libvirtd.conf file, uncommenting all real directives.
---
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 948fe6e..513493f 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -5,6 +5,7 @@ Subject: Debianize libvirt-guests
Origin: vendor
+
---
tools/libvirt-guests.init.sh | 43 +++++++++++++----------------------------
tools/libvirt-guests.sysconf | 6 ++--
@@ -115,4 +116,3 @@ index 9b8b64f..e0644db 100644
# If non-zero, try to bypass the file system cache when saving and
# restoring guests, even though this may give slower operation for
---
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index ffca4c6..003c81d 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -5,16 +5,17 @@ Subject: Don't enable default network on boot
to not interfere with existing network configurations
+
---
src/Makefile.am | 3 ---
src/Makefile.in | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index bf26b19..10c9eab 100644
+index 4c98397..f79b739 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1564,9 +1564,6 @@ if WITH_NETWORK
+@@ -1586,9 +1586,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; }
@@ -25,10 +26,10 @@ index bf26b19..10c9eab 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index cdd5e4b..ee88275 100644
+index e74ebec..4cee374 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -6719,9 +6719,6 @@ install-data-local:
+@@ -7013,9 +7013,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; }
@@ -38,4 +39,3 @@ index cdd5e4b..ee88275 100644
uninstall-local::
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
---
diff --git a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
index 2556378..a1b73cd 100644
--- a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+++ b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
@@ -6,15 +6,16 @@ Closes: #636712
Thanks: Luca Capello
+
---
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
-index f87cfa1..a057799 100644
+index a62833e..3ec4f6c 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
-@@ -3719,7 +3719,7 @@ ebiptablesDriverInit(bool privileged)
+@@ -4025,7 +4025,7 @@ ebiptablesDriverInit(bool privileged)
if (virMutexInit(&execCLIMutex))
return EINVAL;
@@ -23,4 +24,3 @@ index f87cfa1..a057799 100644
grep_cmd_path = virFindFileInPath("grep");
ebtables_cmd_path = virFindFileInPath("ebtables");
---
diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 5ac45c2..215e50e 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -5,6 +5,7 @@ Subject: fix Debian specific path to hvm loader
Closes: #517059
+
---
src/xen/xen_hypervisor.c | 2 +-
tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
@@ -14,10 +15,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 634b23b..0d4adcd 100644
+index 6c71b65..9c924c2 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2329,7 +2329,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2338,7 +2338,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
"/usr/lib64/xen/bin/qemu-dm" :
"/usr/lib/xen/bin/qemu-dm"),
(guest_archs[i].hvm ?
@@ -27,10 +28,10 @@ index 634b23b..0d4adcd 100644
1,
machines)) == NULL) {
diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
-index 42b099c..2886c09 100644
+index 872e5f6..7cde6df 100644
--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -40,10 +41,10 @@ index 42b099c..2886c09 100644
<domain type='xen'>
</domain>
diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
-index 732b693..cf3dfc1 100644
+index 222de1d..e56e306 100644
--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
<arch name='ia64'>
<wordsize>64</wordsize>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -53,10 +54,10 @@ index 732b693..cf3dfc1 100644
<domain type='xen'>
</domain>
diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
-index ef48a95..871cd65 100644
+index 33c4946..25617fc 100644
--- a/tests/xencapsdata/xen-ia64-hvm.xml
+++ b/tests/xencapsdata/xen-ia64-hvm.xml
-@@ -28,7 +28,7 @@
+@@ -29,7 +29,7 @@
<arch name='ia64'>
<wordsize>64</wordsize>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
@@ -66,10 +67,10 @@ index ef48a95..871cd65 100644
<domain type='xen'>
</domain>
diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
-index 52c12c6..83dac3e 100644
+index 8de8cf4..493d1ea 100644
--- a/tests/xencapsdata/xen-x86_64-hvm.xml
+++ b/tests/xencapsdata/xen-x86_64-hvm.xml
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
<arch name='i686'>
<wordsize>32</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
@@ -78,7 +79,7 @@ index 52c12c6..83dac3e 100644
<machine>xenfv</machine>
<domain type='xen'>
</domain>
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
@@ -87,4 +88,3 @@ index 52c12c6..83dac3e 100644
<machine>xenfv</machine>
<domain type='xen'>
</domain>
---
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 955f2a7..ba28e60 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 775d302..d6fbf26 100644
+index 5131ade..35f6a82 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -98,7 +98,7 @@ Output elapsed time information for each command.
@@ -19,4 +19,3 @@ index 775d302..d6fbf26 100644
Most B<virsh> commands require root privileges to run due to the
communications channels used to talk to the hypervisor. Running as
---
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 12305ae..a1fbc65 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,10 +42,10 @@ 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 5de4d24..fdfb32f 100644
+index 2c68be8..9bcd066 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1599,7 +1599,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1632,7 +1632,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
}
*total += disk_total * 1024;
}
@@ -62,4 +62,3 @@ index 5de4d24..fdfb32f 100644
done:
ret = 0;
---
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
index 57c601b..f2cf2f6 100644
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
@@ -26,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 5544a41..8784a6f 100644
+index 76deaa9..a8263d6 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
-@@ -15996,6 +15996,9 @@ vshInit(vshControl *ctl)
+@@ -17098,6 +17098,9 @@ vshInit(vshControl *ctl)
/* set up the signals handlers to catch disconnections */
vshSetupSignals();
@@ -39,4 +39,3 @@ index 5544a41..8784a6f 100644
if (virEventRegisterDefaultImpl() < 0)
return false;
---
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list