Apply updated (correct) fix for xmlparse.c (r1.166 in expat CVS).

PR: ports/157469 Submitted by: Todd Rinaldo <toddr@cpanel.net>
svn path=/head/; revision=280697
2011-08-29 14:33:26 +00:00 · 2011-08-29 14:33:26 +00:00 · 65e5990d1d · 2021-03-31 03:12:20 +00:00
commit 65e5990d1d
parent dd96fc9ddb
2 changed files with 13 additions and 11 deletions
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	expat
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF

--- a/textproc/expat2/files/patch-xmlparse.c
+++ b/textproc/expat2/files/patch-xmlparse.c
@ -1,10 +1,12 @@
--- lib/xmlparse.c.orig	2009-12-08 10:20:08.866482591 +0900
-+++ lib/xmlparse.c	2009-12-08 10:20:23.038667874 +0900
-@@ -3725,7 +3725,6 @@
-         return XML_ERROR_NO_ELEMENTS;
-       default:
-         tok = -tok;
-        next = end;
-         break;
-       }
-     }
+--- lib/xmlparse.c.orig	2007-05-08 11:25:35.000000000 +0900
+++ lib/xmlparse.c	2011-08-29 23:22:09.007745673 +0900
+@@ -3703,6 +3703,9 @@
+         return XML_ERROR_UNCLOSED_TOKEN;
+       case XML_TOK_PARTIAL_CHAR:
+         return XML_ERROR_PARTIAL_CHAR;
+      case -XML_TOK_PROLOG_S:
+        tok = -tok;
+        break;
+       case XML_TOK_NONE:
+ #ifdef XML_DTD
+         /* for internal PE NOT referenced between declarations */