packages: expat/expat.spec, expat/expat-2.0.1-check_stopped_parser.patch (N...

[arekm]

Author: arekm                        Date: Thu Aug 27 06:29:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; security fixes

---- Files affected:
packages/expat:
   expat.spec (1.59 -> 1.60) , expat-2.0.1-check_stopped_parser.patch (NONE -> 1.1)  (NEW), expat-2.0.1-fix_bug_1990430.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/expat/expat.spec
diff -u packages/expat/expat.spec:1.59 packages/expat/expat.spec:1.60
--- packages/expat/expat.spec:1.59	Mon Aug 25 09:51:51 2008
+++ packages/expat/expat.spec	Thu Aug 27 08:29:34 2009
@@ -11,7 +11,7 @@
 Summary(uk.UTF-8):	Переносима бібліотека розбору XML (expat)
 Name:		expat
 Version:	2.0.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	Thai Open Source Software Center Ltd (distributable)
 Group:		Applications/Publishing/XML
@@ -20,6 +20,8 @@
 Patch0:		%{name}-ac_fixes.patch
 Patch1:		%{name}-am18.patch
 Patch2:		%{name}-soname.patch
+Patch3:		%{name}-2.0.1-check_stopped_parser.patch
+Patch4:		%{name}-2.0.1-fix_bug_1990430.patch
 URL:		http://www.libexpat.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -126,6 +128,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
+%patch4 -p0
 
 %build
 %{__libtoolize}
@@ -188,6 +192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2009/08/27 06:29:34  arekm
+- rel 4; security fixes
+
 Revision 1.59  2008/08/25 07:51:51  witekfl
 - added images and examples to devel
 - rel 3

================================================================
Index: packages/expat/expat-2.0.1-check_stopped_parser.patch
diff -u /dev/null packages/expat/expat-2.0.1-check_stopped_parser.patch:1.1
--- /dev/null	Thu Aug 27 08:29:39 2009
+++ packages/expat/expat-2.0.1-check_stopped_parser.patch	Thu Aug 27 08:29:34 2009
@@ -0,0 +1,11 @@
+--- lib/xmlparse.c	2007-05-08 05:25:35.000000000 +0300
++++ lib/xmlparse.c	2008-01-08 13:17:07.000000000 +0200
+@@ -2563,6 +2563,8 @@
+                               (int)(dataPtr - (ICHAR *)dataBuf));
+               if (s == next)
+                 break;
++              if (ps_parsing == XML_FINISHED || ps_parsing == XML_SUSPENDED)
++                break;
+               *eventPP = s;
+             }
+           }

================================================================
Index: packages/expat/expat-2.0.1-fix_bug_1990430.patch
diff -u /dev/null packages/expat/expat-2.0.1-fix_bug_1990430.patch:1.1
--- /dev/null	Thu Aug 27 08:29:39 2009
+++ packages/expat/expat-2.0.1-fix_bug_1990430.patch	Thu Aug 27 08:29:34 2009
@@ -0,0 +1,14 @@
+http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?view=log (1.13 -> 1.15)
+http://svn.python.org/view?view=rev&revision=74429
+
+--- lib/xmltok_impl.c
++++ lib/xmltok_impl.c
+@@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/expat/expat.spec?r1=1.59&r2=1.60&f=u