Rediff patches

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch

@@ -19,10 +19,10 @@ Closes: #685749
  12 files changed, 24 insertions(+), 26 deletions(-)
 
 diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
-index d2d9776..fd31d1c 100644
+index f954599..4dd2abb 100644
 --- a/docs/schemas/capability.rng
 +++ b/docs/schemas/capability.rng
-@@ -271,13 +271,13 @@
+@@ -293,13 +293,13 @@
  
    <define name='emulator'>
      <element name='emulator'>

debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch

@@ -8,10 +8,10 @@ Subject: Allow libvirt group to access the socket
  2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index aeba11d..3d3718a 100644
+index e5856d4..75f1356 100644
 --- a/daemon/libvirtd.conf
 +++ b/daemon/libvirtd.conf
-@@ -78,7 +78,7 @@
+@@ -82,7 +82,7 @@
  # without becoming root.
  #
  # This is restricted to 'root' by default.
@@ -20,7 +20,7 @@ index aeba11d..3d3718a 100644
  
  # Set the UNIX socket permissions for the R/O socket. This is used
  # for monitoring VM status only
-@@ -95,7 +95,8 @@
+@@ -99,7 +99,8 @@
  #
  # If not using PolicyKit and setting group ownership for access
  # control, then you may want to relax this too.
@@ -30,7 +30,7 @@ index aeba11d..3d3718a 100644
  
  # Set the name of the directory in which sockets will be found/created.
  #unix_sock_dir = "/var/run/libvirt"
-@@ -126,7 +127,7 @@
+@@ -130,7 +131,7 @@
  #
  # To restrict monitoring of domains you may wish to enable
  # an authentication mechanism here
@@ -39,7 +39,7 @@ index aeba11d..3d3718a 100644
  
  # Set an authentication scheme for UNIX read-write sockets
  # By default socket permissions only allow root. If PolicyKit
-@@ -135,7 +136,7 @@
+@@ -139,7 +140,7 @@
  #
  # If the unix_sock_rw_perms are changed you may wish to enable
  # an authentication mechanism here

debian/patches/debian/Debianize-libvirt-guests.patch

@@ -18,8 +18,8 @@ index a158b62..62ee35f 100644
 +#
 +### BEGIN INIT INFO
 +# Provides: libvirt-guests
-+# Required-Start: $remote_fs libvirtd
-+# Required-Stop: $remote_fs libvirtd
++# Required-Start: $remote_fs libvirt-bin
++# Required-Stop: $remote_fs libvirt-bin
 +# Default-Start: 2 3 4 5
 +# Default-Stop: 0 1 6
 +# Short-Description: suspend/resume libvirt guests on shutdown/boot

debian/patches/debian/Debianize-systemd-service-files.patch

@@ -17,7 +17,7 @@ index 086da36..9bc433c 100644
  Type=notify
 -EnvironmentFile=-/etc/sysconfig/libvirtd
 -ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+EnvironmentFile=-/etc/default/libvirtd
++EnvironmentFile=-/etc/default/libvirt-bin
 +ExecStart=@sbindir@/libvirtd $libvirtd_opts
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index cfb7097..8d8e1d0 100644
+index 047d4c6..b97c9ae 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2631,9 +2631,6 @@ if WITH_NETWORK
+@@ -2664,9 +2664,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index cfb7097..8d8e1d0 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index bb9dd29..7754ab2 100644
+index 97f9765..1e0b2e9 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -9961,9 +9961,6 @@ install-data-local: install-init install-systemd
+@@ -10089,9 +10089,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

debian/patches/debian/remove-RHism.diff.patch

@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 02671b4..e721b35 100644
+index b248c9a..23186b1 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
@@ -15,7 +15,7 @@ index 02671b4..e721b35 100644
  Most B<virsh> operations rely upon the libvirt library being able to
  connect to an already running libvirtd service.  This can usually be
 -done using the command B<service libvirtd start>.
-+done using the command B<invoke-rc.d libvirtd start>.
++done using the command B<invoke-rc.d libvirt-bin start>.
  
  Most B<virsh> commands require root privileges to run due to the
  communications channels used to talk to the hypervisor.  Running as

debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch

@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 008795c..47b5366 100644
+index fea484d..a916c76 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1543,7 +1543,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,