Rediff patches

debian/patches/Skip-vircgrouptest.patch

@@ -9,7 +9,7 @@ without sysfs mounted.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index dddf33a..f7f5278 100644
+index 7a87640..77a3b23 100644
 --- a/tests/vircgrouptest.c
 +++ b/tests/vircgrouptest.c
 @@ -22,7 +22,7 @@

debian/patches/Use-upstreams-polkit-rule.patch

@@ -9,7 +9,7 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does.
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index d3fc029..5ccb578 100644
+index 59bc4d4..844e532 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
 @@ -301,14 +301,14 @@ install-data-polkit::
@@ -30,10 +30,10 @@ index d3fc029..5ccb578 100644
  endif ! WITH_POLKIT0
  
 diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index 13dbc81..c9efbdc 100644
+index ff34177..be58d21 100644
 --- a/daemon/Makefile.in
 +++ b/daemon/Makefile.in
-@@ -2637,12 +2637,12 @@ admin_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
+@@ -2638,12 +2638,12 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(policydir)
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
  @WITH_LIBVIRTD_TRUE@@WITH_POLKIT0_FALSE@@WITH_POLKIT_TRUE@	$(MKDIR_P) $(DESTDIR)$(rulesdir)

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

@@ -9,7 +9,7 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index be63e26..46a941d 100644
+index 7338ab9..450a010 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -2811,9 +2811,6 @@ if WITH_NETWORK
@@ -23,10 +23,10 @@ index be63e26..46a941d 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index c7dd72d..058b6a2 100644
+index 7533c55..51c10bc 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -10564,9 +10564,6 @@ install-data-local: install-init install-systemd
+@@ -10565,9 +10565,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 bcfa165..167fe94 100644
+index 5ee9a96..c008cc8 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.

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

@@ -42,10 +42,10 @@ 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 2e77534..f0712d1 100644
+index 2aa0460..0c8fbff 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
-@@ -1461,7 +1461,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1471,7 +1471,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
              }
              status->disk_total *= 1024;
          }