Refresh patches

Dropped, fixed upstream:

   LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch

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

@@ -4,8 +4,8 @@ Subject: Debianize systemd service files
 
 ---
  daemon/libvirtd.service.in      | 4 ++--
- tools/libvirt-guests.service.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 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
 index 086da36..9bc433c 100644
@@ -22,6 +22,8 @@ index 086da36..9bc433c 100644
  ExecReload=/bin/kill -HUP $MAINPID
  KillMode=process
  Restart=on-failure
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index d8d7adf..15dfcbd 100644
 --- a/tools/libvirt-guests.service.in
 +++ b/tools/libvirt-guests.service.in
 @@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)

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 e9dc9e0..97172fb 100644
+index cfb7097..8d8e1d0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2630,9 +2630,6 @@ if WITH_NETWORK
+@@ -2631,9 +2631,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 e9dc9e0..97172fb 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index df58b92..d9669c8 100644
+index bb9dd29..7754ab2 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -9949,9 +9949,6 @@ install-data-local: install-init install-systemd
+@@ -9961,9 +9961,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 abd2e93..dc3d63d 100644
+index 02671b4..e721b35 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,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 bd604f0..da7e78b 100644
+index 008795c..47b5366 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1543,7 +1543,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,

debian/patches/security/LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch

-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Tue, 15 Apr 2014 11:20:29 +0100
-Subject: LSN-2014-0003: Don't expand entities when parsing XML
-
-If the XML_PARSE_NOENT flag is passed to libxml2, then any
-entities in the input document will be fully expanded. This
-allows the user to read arbitrary files on the host machine
-by creating an entity pointing to a local file. Removing
-the XML_PARSE_NOENT flag means that any entities are left
-unchanged by the parser, or expanded to "" by the XPath
-APIs.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/util/virxml.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virxml.c b/src/util/virxml.c
-index 9f00f62..34af64a 100644
---- a/src/util/virxml.c
-+++ b/src/util/virxml.c
-@@ -746,11 +746,11 @@ virXMLParseHelper(int domcode,
- 
-     if (filename) {
-         xml = xmlCtxtReadFile(pctxt, filename, NULL,
--                              XML_PARSE_NOENT | XML_PARSE_NONET |
-+                              XML_PARSE_NONET |
-                               XML_PARSE_NOWARNING);
-     } else {
-         xml = xmlCtxtReadDoc(pctxt, BAD_CAST xmlStr, url, NULL,
--                             XML_PARSE_NOENT | XML_PARSE_NONET |
-+                             XML_PARSE_NONET |
-                              XML_PARSE_NOWARNING);
-     }
-     if (!xml)

debian/patches/series

@@ -12,4 +12,3 @@ debian/Debianize-systemd-service-files.patch
 Allow-xen-toolstack-to-find-it-s-binaries.patch
 Skip-vircgrouptest.patch
 Include-param.h-on-kFreeBSD.patch
-security/LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch