[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/1.0.6-1-10-g9f9bb30
Guido Günther
agx at sigxcpu.org
Tue Jul 2 18:40:27 UTC 2013
The following commit has been merged in the master branch:
commit 9854fa9ad6add2e160bfc5b75f298b11933b106a
Author: Guido Günther <agx at sigxcpu.org>
Date: Tue Jul 2 18:03:51 2013 +0200
Rebase patches
diff --git a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
index df6e949..b998360 100644
--- a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
+++ b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -4,18 +4,18 @@ Subject: Allow xen toolstack to find it's binaries
Closes: #685749
---
- docs/schemas/capability.rng | 4 ++--
- src/xen/xen_hypervisor.c | 6 ++----
- tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
- tests/xencapsdata/xen-i686-pae.xml | 2 +-
- tests/xencapsdata/xen-i686.xml | 2 +-
- tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
- tests/xencapsdata/xen-ia64-be.xml | 2 +-
- tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
- tests/xencapsdata/xen-ia64.xml | 2 +-
- tests/xencapsdata/xen-ppc64.xml | 2 +-
- tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
- tests/xencapsdata/xen-x86_64.xml | 2 +-
+ docs/schemas/capability.rng | 4 ++--
+ src/xen/xen_hypervisor.c | 6 ++----
+ tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-i686-pae.xml | 2 +-
+ tests/xencapsdata/xen-i686.xml | 2 +-
+ tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64-be.xml | 2 +-
+ tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64.xml | 2 +-
+ tests/xencapsdata/xen-ppc64.xml | 2 +-
+ tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
+ tests/xencapsdata/xen-x86_64.xml | 2 +-
12 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
@@ -39,7 +39,7 @@ index 106ca73..9745e26 100644
</define>
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 4043d6d..dabdbaa 100644
+index a318ea5..e9da6a3 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2081,11 +2081,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 9537448..d1bb6b3 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -4,7 +4,7 @@ Subject: Disable failing virnetsockettest
until we debugged the interaction with pbuilder
---
- tests/virnetsockettest.c | 2 ++
+ tests/virnetsockettest.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
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 07499c5..077276f 100644
--- a/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
+++ b/debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
@@ -6,7 +6,7 @@ since it fails on at least sparc and mips from time to time.
Issue reported upstresm.
---
- gnulib/tests/test-nonblocking-pipe.sh | 4 ++++
+ gnulib/tests/test-nonblocking-pipe.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gnulib/tests/test-nonblocking-pipe.sh b/gnulib/tests/test-nonblocking-pipe.sh
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index d60755a..f5fa7a6 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -3,11 +3,11 @@ Date: Sat, 14 Jan 2012 18:09:01 +0100
Subject: Don't fail if we can't setup avahi
---
- src/rpc/virnetserver.c | 3 +--
+ src/rpc/virnetserver.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index a54f395..1bf6f94 100644
+index 9f56b03..8684b35 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -1064,8 +1064,7 @@ void virNetServerRun(virNetServerPtr srv)
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index 645fbc2..8064069 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -6,14 +6,14 @@ This isn't a proper fix but it will make virt-manager at least start.
Closes: #663931
---
- src/util/virutil.c | 2 +-
+ src/util/virutil.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
-index a29da14..c41d674 100644
+index 569d035..ab55e95 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
-@@ -1418,7 +1418,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid,
+@@ -1419,7 +1419,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid,
void virFileWaitForDevices(void)
{
# ifdef UDEVADM
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 f39ba3b..42acb59 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
@@ -3,12 +3,12 @@ Date: Thu, 26 Jun 2008 20:01:38 +0200
Subject: Allow libvirt group to access the socket
---
- daemon/libvirtd.conf | 8 ++++----
- daemon/test_libvirtd.aug.in | 4 ----
+ daemon/libvirtd.conf | 8 ++++----
+ daemon/test_libvirtd.aug.in | 4 ----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 47da520..bf0b92a 100644
+index af4493e..61d08e3 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
@@ -48,7 +48,7 @@ index 47da520..bf0b92a 100644
# Change the authentication scheme for TCP sockets.
#
diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
-index 455b74a..3c4a0b7 100644
+index 4e3b878..e213f63 100644
--- a/daemon/test_libvirtd.aug.in
+++ b/daemon/test_libvirtd.aug.in
@@ -9,12 +9,8 @@ module Test_libvirtd =
@@ -63,4 +63,4 @@ index 455b74a..3c4a0b7 100644
- { "auth_unix_rw" = "none" }
{ "auth_tcp" = "sasl" }
{ "auth_tls" = "none" }
- { "key_file" = "/etc/pki/libvirt/private/serverkey.pem" }
+ { "access_drivers"
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 887e319..752fd28 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -5,8 +5,8 @@ Subject: Debianize libvirt-guests
Origin: vendor
---
- tools/libvirt-guests.sh.in | 41 ++++++++++++++++++++++++-----------------
- tools/libvirt-guests.sysconf | 4 ++--
+ tools/libvirt-guests.sh.in | 41 ++++++++++++++++++++++++-----------------
+ tools/libvirt-guests.sysconf | 4 ++--
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index 8378cff..194b6a2 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -3,8 +3,8 @@ Date: Tue, 26 Jun 2012 09:30:39 +0200
Subject: Debianize systemd service files
---
- daemon/libvirtd.service.in | 4 ++--
- tools/libvirt-guests.service.in | 2 +-
+ daemon/libvirtd.service.in | 4 ++--
+ tools/libvirt-guests.service.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
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 e337748..315b099 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,15 +5,15 @@ Subject: Don't enable default network on boot
to not interfere with existing network configurations
---
- src/Makefile.am | 3 ---
- src/Makefile.in | 3 ---
+ src/Makefile.am | 3 ---
+ src/Makefile.in | 3 ---
2 files changed, 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 680101f..b1e3d01 100644
+index 4cf999d..e82ed3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -2196,9 +2196,6 @@ if WITH_NETWORK
+@@ -2340,9 +2340,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; }
@@ -24,10 +24,10 @@ index 680101f..b1e3d01 100644
uninstall-local:: uninstall-init uninstall-systemd
diff --git a/src/Makefile.in b/src/Makefile.in
-index b616b9e..299ad53 100644
+index 1ef1a46..2b7e632 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -7656,9 +7656,6 @@ install-data-local: install-init install-systemd
+@@ -7919,9 +7919,6 @@ install-data-local: install-init install-systemd
@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/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 9b068ea..ec497ca 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,15 +5,15 @@ Subject: fix Debian specific path to hvm loader
Closes: #517059
---
- src/xen/xen_hypervisor.c | 2 +-
- tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
- tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +-
- tests/xencapsdata/xen-ia64-hvm.xml | 2 +-
- tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++--
+ src/xen/xen_hypervisor.c | 2 +-
+ tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
+ tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +-
+ tests/xencapsdata/xen-ia64-hvm.xml | 2 +-
+ tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index cfc8139..4043d6d 100644
+index 9d9c3ee..a318ea5 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2085,7 +2085,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index dde5911..c17cd6c 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -3,11 +3,11 @@ Date: Fri, 7 Mar 2008 09:08:25 +0100
Subject: remove-RHism.diff
---
- tools/virsh.pod | 2 +-
+ tools/virsh.pod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 7c8ce18..66ff2b4 100644
+index 94fe897..583be37 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index b8e60ce..34a1081 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -38,11 +38,11 @@ info migration -- show migration information
This patch triggers for 'info migration' in reply to 'info migrate' command
to savely detect that the command 'info migrate' is not implemented.
---
- src/qemu/qemu_monitor_text.c | 10 +++++++++-
+ src/qemu/qemu_monitor_text.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index d4ee93d..20b9a99 100644
+index 15fbcb7..1a02a61 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1568,7 +1568,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list