rpms/libxml2/devel predefined_entity.patch, NONE, 1.1 libxml2.spec, 1.59, 1.60

Daniel Veillard veillard at fedoraproject.org
Thu Oct 2 21:09:07 UTC 2008


Author: veillard

Update of /cvs/pkgs/rpms/libxml2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27275

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/devel/libxml2.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- libxml2.spec	1 Sep 2008 15:14:58 -0000	1.59
+++ libxml2.spec	2 Oct 2008 21:08:37 -0000	1.60
@@ -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
@@ -9,6 +9,7 @@
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
 Patch0: libxml2-multilib.patch
+Patch1: predefined_entity.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -67,6 +68,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p0
 
 %build
 %configure
@@ -141,6 +143,9 @@
 %doc doc/python.html
 
 %changelog
+* Thu Oct  2 2008 Daniel Veillard <veillard at redhat.com> 2.7.1-2.fc10
+- 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.fc10
 - fix python serialization which was broken in 2.7.0
 - Resolve: rhbz#460774




More information about the scm-commits mailing list