rpms/libxml2/F-9 predefined_entity.patch, NONE, 1.1 libxml2.spec, 1.57, 1.58
Daniel Veillard
veillard at fedoraproject.org
Thu Oct 2 21:00:57 UTC 2008
Author: veillard
Update of /cvs/pkgs/rpms/libxml2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26509
Modified Files:
libxml2.spec
Added Files:
predefined_entity.patch
Log Message:
- fix a nasty bug in 2.7.x, http://bugzilla.gnome.org/show_bug.cgi?id=554660
Daniel
predefined_entity.patch:
--- NEW FILE predefined_entity.patch ---
Index: parser.c
===================================================================
--- parser.c (revision 3795)
+++ parser.c (working copy)
@@ -7225,8 +7225,10 @@ xmlParseStringEntityRef(xmlParserCtxtPtr
* Predefined entites override any extra definition
*/
ent = xmlGetPredefinedEntity(name);
- if (ent != NULL)
+ if (ent != NULL) {
+ *str = ptr;
return(ent);
+ }
/*
* Increate the number of entity references parsed
Index: libxml2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxml2/F-9/libxml2.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libxml2.spec 1 Sep 2008 15:59:43 -0000 1.57
+++ libxml2.spec 2 Oct 2008 21:00:27 -0000 1.58
@@ -1,7 +1,7 @@
Summary: Library providing XML and HTML support
Name: libxml2
Version: 2.7.1
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
License: MIT
Group: Development/Libraries
Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -11,6 +11,7 @@
Prefix: %{_prefix}
Docdir: %{_docdir}
Patch0: multilib.patch
+Patch1: predefined_entity.patch
%description
This library allows to manipulate XML files. It includes support
@@ -60,6 +61,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
%build
%configure
@@ -133,6 +135,9 @@
%doc doc/python.html
%changelog
+* Thu Oct 2 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-2.fc9
+- fix a nasty bug in 2.7.x, http://bugzilla.gnome.org/show_bug.cgi?id=554660
+
* Mon Sep 1 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-1.fc9
- upstream release of 2.7.1
- fix python serialization which was broken in 2.7.0
More information about the scm-commits
mailing list