rpms/libxml2/F-8 predefined_entity.patch, NONE, 1.1 libxml2.spec, 1.52, 1.53

[Daniel Veillard]

Author: veillard

Update of /cvs/pkgs/rpms/libxml2/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26993

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-8/libxml2.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- libxml2.spec	1 Sep 2008 16:01:26 -0000	1.52
+++ libxml2.spec	2 Oct 2008 21:05:32 -0000	1.53
@@ -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
@@ -130,6 +132,9 @@
 %doc doc/python.html
 
 %changelog
+* Thu Oct  2 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-2.fc8
+- 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.fc8
 - upstream release of 2.7.1
 - fix python serialization which was broken in 2.7.0