From 6c153c6536c8cee79d126d012ea46a6ccf0eb995 Mon Sep 17 00:00:00 2001
From: Piotr Bartosiewicz
Date: Mon, 16 Jun 2014 10:26:59 +0200
Subject: [PATCH] Update spec to 1.2.5
Change-Id: I9b63a9b19c5771a3ea31059e838cdc889e7bbc47
---
...03-Don-t-expand-entities-when-parsing-XML.patch | 39 ----------------------
packaging/libvirt.spec | 8 ++---
2 files changed, 3 insertions(+), 44 deletions(-)
delete mode 100644 packaging/0001-LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch
diff --git a/packaging/0001-LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch b/packaging/0001-LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch
deleted file mode 100644
index 29d3ae6..0000000
--- a/packaging/0001-LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d6b27d3e4c40946efa79e91d134616b41b1666c4 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange"
-Date: Tue, 15 Apr 2014 11:20:29 +0100
-Subject: [PATCH] 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
----
- 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)
---
-1.7.9.5
-
diff --git a/packaging/libvirt.spec b/packaging/libvirt.spec
index 32accff..fc47511 100644
--- a/packaging/libvirt.spec
+++ b/packaging/libvirt.spec
@@ -115,16 +115,15 @@
Summary: Library providing a simple virtualization API
Name: libvirt
-Version: 1.2.4
+Version: 1.2.5
Release: 0
License: LGPL-2.0+
Group: Development/Libraries
URL: http://libvirt.org/
Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
-# Gbp-Ignore-Patches: 0 1
-Patch0: 0001-LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch
-Patch1: socket_access.patch
+# Gbp-Ignore-Patches: 0
+Patch0: socket_access.patch
%if %{with_libvirtd}
Requires: libvirt-daemon = %{version}-%{release}
@@ -774,7 +773,6 @@ Includes the Sanlock lock manager plugin for the QEMU driver
# Gbp-Patch-Macros
%patch0 -p1
-%patch1 -p1
%build
%if ! %{with_xen}
--
2.7.4