- rel 4; security fixes

Changed files:
    expat-2.0.1-check_stopped_parser.patch -> 1.1
    expat-2.0.1-fix_bug_1990430.patch -> 1.1
    expat.spec -> 1.60

diff --git a/expat-2.0.1-check_stopped_parser.patch b/expat-2.0.1-check_stopped_parser.patch
new file mode 100644 (file)
index 0000000..23cebfd
--- /dev/null
+++ b/expat-2.0.1-check_stopped_parser.patch
@@ -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;
+             }
+           }

diff --git a/expat-2.0.1-fix_bug_1990430.patch b/expat-2.0.1-fix_bug_1990430.patch
new file mode 100644 (file)
index 0000000..17dc166
--- /dev/null
+++ b/expat-2.0.1-fix_bug_1990430.patch
@@ -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: \

diff --git a/expat.spec b/expat.spec
index fc96026e2bf341eb85243d33c44570a67ab2095f..68c13361c0af7b2a50f87a77ddbc682fa93e9acd 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -10,7 +10,7 @@ Summary(ru.UTF-8):    Переносимая библиотека разбора XM
 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
@@ -19,6 +19,8 @@ Source0:      http://dl.sourceforge.net/expat/%{name}-%{version}.tar.gz
 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
@@ -125,6 +127,8 @@ Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
+%patch4 -p0
 
 %build
 %{__libtoolize}