aboutsummaryrefslogtreecommitdiff
path: root/textproc/expat2
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2011-08-29 14:33:26 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2011-08-29 14:33:26 +0000
commit65e5990d1d24e8f5a0f598842ca946ab3cb06743 (patch)
tree4b9f110f328d3009643e55c35093c28a58363b05 /textproc/expat2
parentdd96fc9ddba027aaa9cc513f0f4bf40b2735d847 (diff)
downloadports-65e5990d1d24e8f5a0f598842ca946ab3cb06743.tar.gz
ports-65e5990d1d24e8f5a0f598842ca946ab3cb06743.zip
Apply updated (correct) fix for xmlparse.c (r1.166 in expat CVS).
PR: ports/157469 Submitted by: Todd Rinaldo <toddr@cpanel.net>
Notes
Notes: svn path=/head/; revision=280697
Diffstat (limited to 'textproc/expat2')
-rw-r--r--textproc/expat2/Makefile2
-rw-r--r--textproc/expat2/files/patch-xmlparse.c22
2 files changed, 13 insertions, 11 deletions
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 9c8586b4ed06..045e00876628 100644
--- 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
diff --git a/textproc/expat2/files/patch-xmlparse.c b/textproc/expat2/files/patch-xmlparse.c
index e9992dd199ef..1094c0f8caf2 100644
--- 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 */